<!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>[52010] trunk/tests/phpunit/tests: Coding Standards: Add visibility to methods in `tests/phpunit/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/52010">52010</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/52010","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-04 15:22:47 +0000 (Thu, 04 Nov 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Add visibility to methods in `tests/phpunit/tests/`.
Adds a `public` visibility to test fixtures, tests, data providers, and callbacks methods.
Adds a `private` visibility to helper methods within test classes.
Renames callbacks and helpers that previously started with a `_` prefix. Why? For consistency and to leverage using the method visibility. Further naming standardizations is beyond the scope of this commit.
Props costdev, jrf, hellofromTonya.
Fixes <a href="https://core.trac.wordpress.org/ticket/54177">#54177</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsactionscallbacksphp">trunk/tests/phpunit/tests/actions/callbacks.php</a></li>
<li><a href="#trunktestsphpunittestsactionsclosuresphp">trunk/tests/phpunit/tests/actions/closures.php</a></li>
<li><a href="#trunktestsphpunittestsactionsphp">trunk/tests/phpunit/tests/actions.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesFilephp">trunk/tests/phpunit/tests/admin/includesFile.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="#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="#trunktestsphpunittestsajaxEditCommentphp">trunk/tests/phpunit/tests/ajax/EditComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxManageThemesphp">trunk/tests/phpunit/tests/ajax/ManageThemes.php</a></li>
<li><a href="#trunktestsphpunittestsajaxReplytoCommentphp">trunk/tests/phpunit/tests/ajax/ReplytoComment.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="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>
<li><a href="#trunktestsphpunittestsblocktemplateutilsphp">trunk/tests/phpunit/tests/block-template-utils.php</a></li>
<li><a href="#trunktestsphpunittestsblocktemplatephp">trunk/tests/phpunit/tests/block-template.php</a></li>
<li><a href="#trunktestsphpunittestsblockscontextphp">trunk/tests/phpunit/tests/blocks/context.php</a></li>
<li><a href="#trunktestsphpunittestsblockseditorphp">trunk/tests/phpunit/tests/blocks/editor.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="#trunktestsphpunittestsblocksserializephp">trunk/tests/phpunit/tests/blocks/serialize.php</a></li>
<li><a href="#trunktestsphpunittestsblockswpBlockphp">trunk/tests/phpunit/tests/blocks/wpBlock.php</a></li>
<li><a href="#trunktestsphpunittestsblockswpBlockListphp">trunk/tests/phpunit/tests/blocks/wpBlockList.php</a></li>
<li><a href="#trunktestsphpunittestsblockswpBlockTypephp">trunk/tests/phpunit/tests/blocks/wpBlockType.php</a></li>
<li><a href="#trunktestsphpunittestscachephp">trunk/tests/phpunit/tests/cache.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalcustomRulesphp">trunk/tests/phpunit/tests/canonical/customRules.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalhttpsphp">trunk/tests/phpunit/tests/canonical/https.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalnoRewritephp">trunk/tests/phpunit/tests/canonical/noRewrite.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpageOnFrontphp">trunk/tests/phpunit/tests/canonical/pageOnFront.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpagedphp">trunk/tests/phpunit/tests/canonical/paged.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpostStatusphp">trunk/tests/phpunit/tests/canonical/postStatus.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="#trunktestsphpunittestscommentgetCommentsPagesCountphp">trunk/tests/phpunit/tests/comment/getCommentsPagesCount.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="#trunktestsphpunittestscommentwalkerphp">trunk/tests/phpunit/tests/comment/walker.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="#trunktestsphpunittestscronphp">trunk/tests/phpunit/tests/cron.php</a></li>
<li><a href="#trunktestsphpunittestscustomizecontrolphp">trunk/tests/phpunit/tests/customize/control.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="#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="#trunktestsphpunittestsdatemysql2datephp">trunk/tests/phpunit/tests/date/mysql2date.php</a></li>
<li><a href="#trunktestsphpunittestsdatetheDatephp">trunk/tests/phpunit/tests/date/theDate.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="#trunktestsphpunittestsdbrealEscapephp">trunk/tests/phpunit/tests/db/realEscape.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="#trunktestsphpunittestsdependencieswpSanitizeScriptAttributesphp">trunk/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php</a></li>
<li><a href="#trunktestsphpunittestsdependencieswpScriptTagphp">trunk/tests/phpunit/tests/dependencies/wpScriptTag.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesphp">trunk/tests/phpunit/tests/dependencies.php</a></li>
<li><a href="#trunktestsphpunittestsexternalhttpbasicphp">trunk/tests/phpunit/tests/external-http/basic.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="#trunktestsphpunittestsfilesystembasephp">trunk/tests/phpunit/tests/filesystem/base.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="#trunktestsphpunittestsformattingbalanceTagsphp">trunk/tests/phpunit/tests/formatting/balanceTags.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="#trunktestsphpunittestsformattingconvertSmiliesphp">trunk/tests/phpunit/tests/formatting/convertSmilies.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="#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="#trunktestsphpunittestsformattingescJsphp">trunk/tests/phpunit/tests/formatting/escJs.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="#trunktestsphpunittestsformattingexcerptRemoveBlocksphp">trunk/tests/phpunit/tests/formatting/excerptRemoveBlocks.php</a></li>
<li><a href="#trunktestsphpunittestsformattinggetBloginfophp">trunk/tests/phpunit/tests/formatting/getBloginfo.php</a></li>
<li><a href="#trunktestsphpunittestsformattinggetUrlInContentphp">trunk/tests/phpunit/tests/formatting/getUrlInContent.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="#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="#trunktestsphpunittestsformattingnormalizeWhitespacephp">trunk/tests/phpunit/tests/formatting/normalizeWhitespace.php</a></li>
<li><a href="#trunktestsphpunittestsformattingredirectphp">trunk/tests/phpunit/tests/formatting/redirect.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="#trunktestsphpunittestsformattingsanitizePostphp">trunk/tests/phpunit/tests/formatting/sanitizePost.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="#trunktestsphpunittestsformattingseemsUtf8php">trunk/tests/phpunit/tests/formatting/seemsUtf8.php</a></li>
<li><a href="#trunktestsphpunittestsformattingslashitphp">trunk/tests/phpunit/tests/formatting/slashit.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="#trunktestsphpunittestsformattingutf8UriEncodephp">trunk/tests/phpunit/tests/formatting/utf8UriEncode.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpAutopphp">trunk/tests/phpunit/tests/formatting/wpAutop.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpBasenamephp">trunk/tests/phpunit/tests/formatting/wpBasename.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpHtmlExcerptphp">trunk/tests/phpunit/tests/formatting/wpHtmlExcerpt.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpHtmlSplitphp">trunk/tests/phpunit/tests/formatting/wpHtmlSplit.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpHtmleditPrephp">trunk/tests/phpunit/tests/formatting/wpHtmleditPre.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpIsoDescramblerphp">trunk/tests/phpunit/tests/formatting/wpIsoDescrambler.php</a></li>
<li><a href="#trunktestsphpunittestsformattingwpMakeLinkRelativephp">trunk/tests/phpunit/tests/formatting/wpMakeLinkRelative.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="#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="#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="#trunktestsphpunittestsformattingzeroisephp">trunk/tests/phpunit/tests/formatting/zeroise.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsaddMagicQuotesphp">trunk/tests/phpunit/tests/functions/addMagicQuotes.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsallowedProtocolsphp">trunk/tests/phpunit/tests/functions/allowedProtocols.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionscanonicalCharsetphp">trunk/tests/phpunit/tests/functions/canonicalCharset.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionspluginBasenamephp">trunk/tests/phpunit/tests/functions/pluginBasename.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionswpAuthCheckphp">trunk/tests/phpunit/tests/functions/wpAuthCheck.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionswpGetArchivesphp">trunk/tests/phpunit/tests/functions/wpGetArchives.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionswpValidateBooleanphp">trunk/tests/phpunit/tests/functions/wpValidateBoolean.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralpaginateLinksphp">trunk/tests/phpunit/tests/general/paginateLinks.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralwpGetArchivesphp">trunk/tests/phpunit/tests/general/wpGetArchives.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralwpGetDocumentTitlephp">trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralwpResourceHintsphp">trunk/tests/phpunit/tests/general/wpResourceHints.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="#trunktestsphpunittestshttpwpRemoteRetrieveHeadersphp">trunk/tests/phpunit/tests/http/wpRemoteRetrieveHeaders.php</a></li>
<li><a href="#trunktestsphpunittestsimagedimensionsphp">trunk/tests/phpunit/tests/image/dimensions.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="#trunktestsphpunittestsimagesiteIconphp">trunk/tests/phpunit/tests/image/siteIcon.php</a></li>
<li><a href="#trunktestsphpunittestsimagesizephp">trunk/tests/phpunit/tests/image/size.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="#trunktestsphpunittestsincludeshelpersphp">trunk/tests/phpunit/tests/includes/helpers.php</a></li>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
<li><a href="#trunktestsphpunittestsl10nloadTextdomainphp">trunk/tests/phpunit/tests/l10n/loadTextdomain.php</a></li>
<li><a href="#trunktestsphpunittestsl10ntranslateSettingsUsingI18nSchemaphp">trunk/tests/phpunit/tests/l10n/translateSettingsUsingI18nSchema.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="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>
<li><a href="#trunktestsphpunittestsloadwpConvertHrToBytesphp">trunk/tests/phpunit/tests/load/wpConvertHrToBytes.php</a></li>
<li><a href="#trunktestsphpunittestsloadwpIsIniValueChangeablephp">trunk/tests/phpunit/tests/load/wpIsIniValueChangeable.php</a></li>
<li><a href="#trunktestsphpunittestsmailphp">trunk/tests/phpunit/tests/mail.php</a></li>
<li><a href="#trunktestsphpunittestsmediagetAdjacentImageLinkphp">trunk/tests/phpunit/tests/media/getAdjacentImageLink.php</a></li>
<li><a href="#trunktestsphpunittestsmediagetNextImageLinkphp">trunk/tests/phpunit/tests/media/getNextImageLink.php</a></li>
<li><a href="#trunktestsphpunittestsmediagetPreviousImageLinkphp">trunk/tests/phpunit/tests/media/getPreviousImageLink.php</a></li>
<li><a href="#trunktestsphpunittestsmedianextImageLinkphp">trunk/tests/phpunit/tests/media/nextImageLink.php</a></li>
<li><a href="#trunktestsphpunittestsmediapreviousImageLinkphp">trunk/tests/phpunit/tests/media/previousImageLink.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="#trunktestsphpunittestsmenuwalkernavmenueditphp">trunk/tests/phpunit/tests/menu/walker-nav-menu-edit.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="#trunktestsphpunittestsmultisitecleanDirsizeCachephp">trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetSpaceUsedphp">trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteisUploadSpaceAvailablephp">trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitemsFilesRewritingphp">trunk/tests/phpunit/tests/multisite/msFilesRewriting.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteupdateBlogDetailsphp">trunk/tests/phpunit/tests/multisite/updateBlogDetails.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitewpMsSitesListTablephp">trunk/tests/phpunit/tests/multisite/wpMsSitesListTable.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitephp">trunk/tests/phpunit/tests/multisite.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="#trunktestsphpunittestsoembedheadersphp">trunk/tests/phpunit/tests/oembed/headers.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="#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="#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="#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="#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="#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="#trunktestsphpunittestspostisPostStatusViewablephp">trunk/tests/phpunit/tests/post/isPostStatusViewable.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="#trunktestsphpunittestspostwpAfterInsertPostphp">trunk/tests/phpunit/tests/post/wpAfterInsertPost.php</a></li>
<li><a href="#trunktestsphpunittestspostwpInsertPostphp">trunk/tests/phpunit/tests/post/wpInsertPost.php</a></li>
<li><a href="#trunktestsphpunittestspostwpListPagesphp">trunk/tests/phpunit/tests/post/wpListPages.php</a></li>
<li><a href="#trunktestsphpunittestspostwpPublishPostphp">trunk/tests/phpunit/tests/post/wpPublishPost.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="#trunktestsphpunittestsqueryisTermphp">trunk/tests/phpunit/tests/query/isTerm.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="#trunktestsphpunittestsqueryverboseRewriteRulesphp">trunk/tests/phpunit/tests/query/verboseRewriteRules.php</a></li>
<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.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="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
<li><a href="#trunktestsphpunittestsshortcodephp">trunk/tests/phpunit/tests/shortcode.php</a></li>
<li><a href="#trunktestsphpunittestssitehealthphp">trunk/tests/phpunit/tests/site-health.php</a></li>
<li><a href="#trunktestsphpunittestssitemapsfunctionsphp">trunk/tests/phpunit/tests/sitemaps/functions.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermByphp">trunk/tests/phpunit/tests/term/getTermBy.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermFieldphp">trunk/tests/phpunit/tests/term/getTermField.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="#trunktestsphpunitteststermslashesphp">trunk/tests/phpunit/tests/term/slashes.php</a></li>
<li><a href="#trunktestsphpunitteststermtermCountsphp">trunk/tests/phpunit/tests/term/termCounts.php</a></li>
<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGenerateTagCloudphp">trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGetObjectTermsphp">trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpSetObjectTermsphp">trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpUpdateTermphp">trunk/tests/phpunit/tests/term/wpUpdateTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
<li><a href="#trunktestsphpunitteststhemecustomHeaderphp">trunk/tests/phpunit/tests/theme/customHeader.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="#trunktestsphpunittestsuserlistAuthorsphp">trunk/tests/phpunit/tests/user/listAuthors.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="#trunktestsphpunittestsusersessionphp">trunk/tests/phpunit/tests/user/session.php</a></li>
<li><a href="#trunktestsphpunittestsuserslashesphp">trunk/tests/phpunit/tests/user/slashes.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="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
<li><a href="#trunktestsphpunittestswalkerphp">trunk/tests/phpunit/tests/walker.php</a></li>
<li><a href="#trunktestsphpunittestswidgetswpWidgetCustomHtmlphp">trunk/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php</a></li>
<li><a href="#trunktestsphpunittestswidgetswpWidgetMediaphp">trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php</a></li>
<li><a href="#trunktestsphpunittestswidgetswpWidgetMediaAudiophp">trunk/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php</a></li>
<li><a href="#trunktestsphpunittestswidgetswpWidgetMediaImagephp">trunk/tests/phpunit/tests/widgets/wpWidgetMediaImage.php</a></li>
<li><a href="#trunktestsphpunittestswidgetswpWidgetMediaVideophp">trunk/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php</a></li>
<li><a href="#trunktestsphpunittestswidgetswpWidgetTextphp">trunk/tests/phpunit/tests/widgets/wpWidgetText.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>
<li><a href="#trunktestsphpunittestsxmlrpcwpuploadFilephp">trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/actions/callbacks.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_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">- function test_callback_representations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_callback_representations() {
</ins><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"> $this->assertFalse( has_action( $tag ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsactionsclosuresphp"></a>
<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/closures.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions/closures.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/actions/closures.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @covers ::has_action
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_action_closure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_closure() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = 'test_action_closure';
</span><span class="cx" style="display: block; padding: 0 10px"> $closure = static function( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS[ $a ] = $b;
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/actions.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_simple_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_simple_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove_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">- function test_remove_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</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="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"> * @covers ::has_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">- function test_has_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $func = __FUNCTION__ . '_func';
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_multiple_actions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_actions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</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"> * @covers ::do_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">- function test_action_args_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_args_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_action_args_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_args_2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_action_args_3() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_args_3() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a3 = new MockAction();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_action_args_with_php4_syntax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_args_with_php4_syntax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = new stdClass();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $val ), array_pop( $argsvar ) );
</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">- function test_action_priority() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_priority() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</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="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"> * @covers ::did_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">- function test_did_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_did_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag1 = 'action1';
</span><span class="cx" style="display: block; padding: 0 10px"> $tag2 = 'action2';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_all_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_all_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $tag2 = __FUNCTION__ . '_2';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove_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">- function test_remove_all_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_all_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</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="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"> * @covers ::do_action_ref_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">- function test_action_ref_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_ref_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $obj = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_action_keyed_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_keyed_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,13 +353,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove_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">- function test_action_self_removal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_self_removal() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, did_action( 'test_action_self_removal' ) );
</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">- function action_self_removal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_self_removal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'test_action_self_removal', array( $this, 'action_self_removal' ) );
</span><span class="cx" style="display: block; padding: 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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function test_action_recursion() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_recursion() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $b = new MockAction();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::do_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">- function action_that_causes_recursion( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_that_causes_recursion( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> static $recursing = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $recursing ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $recursing = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove_action
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_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">- function test_action_callback_manipulation_while_running() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_action_callback_manipulation_while_running() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $b = new MockAction();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $e->get_call_count(), 'callback added by later priority callback should not get called' );
</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">- function action_that_manipulates_a_running_hook( $tag, $mocks ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_that_manipulates_a_running_hook( $tag, $mocks ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( $tag, array( $mocks[1], 'action' ), 12, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( $tag, array( $mocks[2], 'action' ), 12, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( $tag, array( $mocks[3], 'action' ), 13, 2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove_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">- function test_remove_anonymous_callback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_anonymous_callback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( $tag, array( $a, 'action' ), 12, 1 );
</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"> * @covers WP_Hook::offsetSet
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Hook::offsetUnset
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_array_access_of_wp_filter_global() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_array_access_of_wp_filter_global() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::current_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">- function test_current_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_current_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_filter;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_current_filter[] = 'first';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_current_filter[] = 'second'; // Let's say a second action was invoked.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +516,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::doing_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">- function test_doing_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_doing_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_filter;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_current_filter = array(); // Set to an empty array first.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::doing_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">- function test_doing_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_doing_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_filter;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_current_filter = array(); // Set to an empty array first.
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::doing_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">- function test_doing_filter_real() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_doing_filter_real() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( doing_filter() ); // No filter is passed in, and no filter is being processed.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( doing_filter( 'testing' ) ); // Filter is passed in but not being processed.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,7 +575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( doing_filter( 'testing' ) ); // No longer doing this filter.
</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">- function apply_testing_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function apply_testing_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->apply_testing_filter = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( doing_filter() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( doing_filter( 'testing_nested' ) );
</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">- function apply_testing_nested_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function apply_testing_nested_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->apply_testing_nested_filter = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( doing_filter() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( doing_filter( 'testing' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/admin/includesFile.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @covers ::get_home_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">- function test_get_home_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_home_path() {
</ins><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></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::_restore_mu_plugins();
</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">- function test_get_plugin_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_plugin_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default_headers = array(
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_menu_page_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_menu_page_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', 'http://example.com' );
</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"> * @dataProvider data_submenu_position
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_submenu_position( $position, $expected_position ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_submenu_position( $position, $expected_position ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $submenu;
</span><span class="cx" style="display: block; padding: 0 10px"> global $menu;
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</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"> * @dataProvider data_submenu_position
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_submenu_helpers_position( $position, $expected_position ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_submenu_helpers_position( $position, $expected_position ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $submenu;
</span><span class="cx" style="display: block; padding: 0 10px"> global $menu;
</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"> * }
</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">- function submenus_to_add() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function submenus_to_add() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'Submenu Position', 'Submenu Position', 'manage_options', 'sub-page', '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'Submenu Position 2', 'Submenu Position 2', 'manage_options', 'sub-page2', '' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,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">- function data_submenu_position() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_submenu_position() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_count = count( $this->submenus_to_add() );
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( null, $menu_count ), // Insert at the end of the menu if null is passed. Default behavior.
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48599
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_position_when_parent_slug_child_slug_are_the_same() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_position_when_parent_slug_child_slug_are_the_same() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $submenu, $menu;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset menus.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48599
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_passing_string_as_position_fires_doing_it_wrong() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_passing_string_as_position_fires_doing_it_wrong() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'add_submenu_page' );
</span><span class="cx" style="display: block; padding: 0 10px"> global $submenu, $menu;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'submenu_page_1', $submenu['main_slug'][1][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">- function test_is_plugin_active_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_plugin_active_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $test = is_plugin_active( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $test );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,19 +332,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( 'hello.php' );
</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">- function test_is_plugin_active_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_plugin_active_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $test = is_plugin_active( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $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">- function test_is_plugin_inactive_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_plugin_inactive_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $test = is_plugin_inactive( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $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">- function test_is_plugin_inactive_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_plugin_inactive_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $test = is_plugin_inactive( 'hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $test );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$post_id = $factory->post->create();
</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">- function test__wp_translate_postdata_cap_checks_contributor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__wp_translate_postdata_cap_checks_contributor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$contributor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create new draft post.
</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"> $this->assertSame( 'Sorry, you are not allowed to edit posts as this user.', $_results->get_error_message() );
</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">- function test__wp_translate_postdata_cap_checks_editor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__wp_translate_postdata_cap_checks_editor() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create new draft post.
</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"> * @ticket 25272
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_edit_post_auto_draft() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_post_auto_draft() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'auto-draft', $post->post_status );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -789,7 +789,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $p, post_exists( $title, $content, $date ) );
</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">- function test_use_block_editor_for_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_use_block_editor_for_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( use_block_editor_for_post( -1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $bogus_post_id = $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">@@ -822,7 +822,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'use_block_editor_for_post', '__return_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">- function test_get_block_editor_server_block_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_editor_server_block_settings() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> 'icon' => 'text',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/admin/includesSchema.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44893
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_populate_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">- function test_populate_options( $options, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_populate_options( $options, $expected ) {
</ins><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"> $orig_options = $wpdb->options;
</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"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_populate_site_meta
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_populate_site_meta( $meta, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_populate_site_meta( $meta, $expected ) {
</ins><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"> $orig_blogmeta = $wpdb->blogmeta;
</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"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_populate_network_meta
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_populate_network_meta( $meta, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_populate_network_meta( $meta, $expected ) {
</ins><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"> $orig_sitemeta = $wpdb->sitemeta;
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/admin/includesScreen.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,12 +155,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_taxonomies']['old-or-new'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_set_current_screen_with_hook_suffix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_current_screen_with_hook_suffix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_screen;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->core_screens as $hook_name => $screen ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,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">- function test_post_type_as_hookname() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_as_hookname() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $screen = convert_to_screen( 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->post_type, 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->base, 'post' );
</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"> $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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_type_with_special_suffix_as_hookname() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_with_special_suffix_as_hookname() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->post_type, 'value-add' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_taxonomy_with_special_suffix_as_hookname() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_taxonomy_with_special_suffix_as_hookname() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->taxonomy, 'old-or-new' );
</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"> $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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_type_with_edit_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_with_edit_prefix() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->post_type, 'edit-some-thing' );
</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( $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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_type_edit_collisions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_edit_collisions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'comments' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'tags' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->base, 'post' );
</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">- function test_help_tabs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_help_tabs() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Help!',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19828
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_help_tabs_priority() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_help_tabs_priority() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab_1 = 'tab1';
</span><span class="cx" style="display: block; padding: 0 10px"> $tab_1_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Help!',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25799
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_options() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_options() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $option_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'Option',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $screen->get_options(), array() );
</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">- function test_in_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_in_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'edit.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( get_current_screen()->in_admin() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( get_current_screen()->in_admin( 'site' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/admin/includesTheme.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Admin_IncludesTheme extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_root = DIR_TESTDATA . '/themedir1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,9 +11,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'theme_root', array( $this, '_theme_root' ) );
- add_filter( 'stylesheet_root', array( $this, '_theme_root' ) );
- add_filter( 'template_root', array( $this, '_theme_root' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
+ add_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
+ add_filter( 'template_root', array( $this, 'filter_theme_root' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear caches.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,11 +20,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'theme_root', array( $this, '_theme_root' ) );
- remove_filter( 'stylesheet_root', array( $this, '_theme_root' ) );
- remove_filter( 'template_root', array( $this, '_theme_root' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
+ remove_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
+ remove_filter( 'template_root', array( $this, 'filter_theme_root' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace the normal theme root directory with our premade test directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _theme_root( $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_theme_root( $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->theme_root;
</span><span class="cx" style="display: block; padding: 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"> * @expectedDeprecated get_theme
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_templates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_templates() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = get_theme( 'Page Template Theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18375
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_templates_different_post_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_templates_different_post_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( 'page-templates' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38766
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_templates_for_post_types_with_trailing_periods() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_templates_for_post_types_with_trailing_periods() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( 'page-templates' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $theme );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38696
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_templates_child_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_templates_child_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( 'page-templates-child' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group external-http
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_theme_featured_list_api() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_theme_featured_list_api() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $featured_list_api = get_theme_feature_list( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNonEmptyMultidimensionalArray( $featured_list_api );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group external-http
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_theme_featured_list_hardcoded() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_theme_featured_list_hardcoded() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $featured_list_hardcoded = get_theme_feature_list( false );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNonEmptyMultidimensionalArray( $featured_list_hardcoded );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/adminbar.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21117
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_content_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_content_post_type() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'content', array( 'show_in_admin_bar' => true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21117
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_merging_existing_meta_values() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_merging_existing_meta_values() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_bar = new WP_Admin_Bar;
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxCustomizeManagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/ajax/CustomizeManager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $allcaps An array of all the user's capabilities.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array All caps.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_user_has_cap( $allcaps ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_user_has_cap( $allcaps ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allcaps = array_merge( $allcaps, $this->overridden_caps );
</span><span class="cx" style="display: block; padding: 0 10px"> return $allcaps;
</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"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_failures() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_failures() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</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->register_controls();
</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"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_success_publish_create() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_success_publish_create() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = $this->set_up_valid_state();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['customize_changeset_status'] = 'publish';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_success_publish_edit() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_success_publish_edit() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</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(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38943
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_success_save_post_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_success_save_post_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param string $role The role we're checking caps against.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected_results Expected results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ajax_load_available_items_cap_check( $role, $expected_results ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_load_available_items_cap_check( $role, $expected_results ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'administrator' !== $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're not an admin, we should get a wp_die( -1 ).
</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"> * }
</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">- function data_ajax_load_available_items_cap_check() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ajax_load_available_items_cap_check() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscriber',
</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"> * @param array $post_args POST args.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $expected_results Expected results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ajax_load_available_items_error_messages( $post_args, $expected_results ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_load_available_items_error_messages( $post_args, $expected_results ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,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">- function data_ajax_load_available_items_error_messages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ajax_load_available_items_error_messages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Testing empty obj_type and type.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> * @param array $post_args POST args.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $success_status Success status.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ajax_load_available_items_success_status( $post_args, $success_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_load_available_items_success_status( $post_args, $success_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_ajax_load_available_items_success_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ajax_load_available_items_success_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_args POST 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">- function test2_ajax_load_available_items_structure( $post_args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test2_ajax_load_available_items_structure( $post_args ) {
</ins><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"> $expected_keys = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,7 +436,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">- function data_ajax_load_available_items_structure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ajax_load_available_items_structure() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +467,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $role Role.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected_results Expected results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ajax_search_available_items_caps_check( $role, $expected_results ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_search_available_items_caps_check( $role, $expected_results ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'administrator' !== $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're not an admin, we should get a wp_die( -1 ).
</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"> * }
</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">- function data_ajax_search_available_items_caps_check() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ajax_search_available_items_caps_check() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscriber',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +546,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_args POST args.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected_results Expected results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ajax_search_available_items_results( $post_args, $expected_results ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_search_available_items_results( $post_args, $expected_results ) {
</ins><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"> self::factory()->post->create_many( 5, array( 'post_title' => 'Test Post' ) );
</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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_ajax_search_available_items_results() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ajax_search_available_items_results() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::ajax_insert_auto_draft_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">- function test_ajax_insert_auto_draft_post_success() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_insert_auto_draft_post_success() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST = wp_slash(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-menus-nonce' => wp_create_nonce( 'customize-menus' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,7 +669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::ajax_insert_auto_draft_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">- function test_ajax_insert_auto_draft_failures() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ajax_insert_auto_draft_failures() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No nonce.
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_last_response = '';
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/ajax/EditComment.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 33154
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_editor_can_edit_orphan_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_editor_can_edit_orphan_comments() {
</ins><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"> // Become an editor.
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxManageThemesphp"></a>
<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/ManageThemes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ManageThemes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/ajax/ManageThemes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> private $orig_theme_dir;
</span><span class="cx" style="display: block; padding: 0 10px"> private $theme_root;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_root = DIR_TESTDATA . '/themedir1';
</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"> unset( $GLOBALS['wp_themes'] );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
</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"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_uppercase_theme_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_uppercase_theme_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_setRole( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Blocks comments from being saved on 'pre_comment_approved', by returning WP_Error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _pre_comment_approved_filter( $approved, $commentdata ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _pre_comment_approved_filter( $approved, $commentdata ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'comment_wrong', 'pre_comment_approved filter fails for new comment.', 403 );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/attachment/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$author_id = $factory->user->create( array( 'role' => 'editor' ) );
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_insert_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_attachment(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/auth.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$wp_hasher = new PasswordHash( 8, 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->user = clone self::$_user;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,12 +49,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_auth_cookie_valid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_auth_cookie_valid() {
</ins><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"> $this->assertSame( self::$user_id, wp_validate_auth_cookie( $cookie, 'auth' ) );
</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">- function test_auth_cookie_invalid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_auth_cookie_invalid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 3600 or less and +3600 may occur in wp_validate_auth_cookie(),
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_validate_auth_cookie( self::$user_id, 'auth' ), 'altered cookie' );
</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">- function test_auth_cookie_scheme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_auth_cookie_scheme() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::$user_id, wp_validate_auth_cookie( $cookie, 'foo' ) );
</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"> * @ticket 23494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_password_trimming() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_password_trimming() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $passwords_to_test = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a password with no trailing or leading spaces',
</span><span class="cx" style="display: block; padding: 0 10px"> 'a password with trailing spaces ',
</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"> * @ticket 24973
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_hash_password_trimming() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_hash_password_trimming() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $password = ' pass with leading whitespace';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_check_password( 'pass with leading whitespace', wp_hash_password( $password ) ) );
</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><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29217
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_verify_nonce_with_empty_arg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_verify_nonce_with_empty_arg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_verify_nonce( '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_verify_nonce( null ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29542
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_verify_nonce_with_integer_arg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_verify_nonce_with_integer_arg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_verify_nonce( 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">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24030
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_nonce_verify_failed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_nonce_verify_failed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nonce = substr( md5( uniqid() ), 0, 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> $count = did_action( $this->nonce_failure_hook );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24030
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_nonce_verify_success() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_nonce_verify_success() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'nonce_test_action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $count = did_action( $this->nonce_failure_hook );
</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"> unset( $_REQUEST['_wpnonce'] );
</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">- function test_password_length_limit() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_password_length_limit() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $limit = str_repeat( 'a', 4096 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_password( $limit, self::$user_id );
</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"> * @ticket 45746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_activation_key_is_saved() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_activation_key_is_saved() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $this->user->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = get_password_reset_key( $user );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32429
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_activation_key_is_checked() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_activation_key_is_checked() {
</ins><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"> $key = wp_generate_password( 20, false );
</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"> * @ticket 32429
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_expired_user_activation_key_is_rejected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_expired_user_activation_key_is_rejected() {
</ins><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"> $key = wp_generate_password( 20, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32429
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_user_activation_key_fails_key_check() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_user_activation_key_fails_key_check() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An empty user_activation_key should not allow any key to be accepted.
</span><span class="cx" style="display: block; padding: 0 10px"> $check = check_password_reset_key( 'key', $this->user->user_login );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32429
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_legacy_user_activation_key_is_rejected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_legacy_user_activation_key_is_rejected() {
</ins><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"> // A legacy user_activation_key is one without the `time()` prefix introduced in WordPress 4.3.
</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"> * @ticket 32429
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24783
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_plaintext_user_activation_key_is_rejected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_plaintext_user_activation_key_is_rejected() {
</ins><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"> // A plaintext user_activation_key is one stored before hashing was introduced in WordPress 3.7.
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/basic.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Basic extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_license() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_license() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This test is designed to only run on trunk/master.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipOnAutomatedBranches();
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertSame( $this_year, trim( $matches[1] ), "license.txt's year needs to be updated to $this_year." );
</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">- function test_security_md() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_security_md() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This test is designed to only run on trunk/master.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipOnAutomatedBranches();
</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"> $this->assertSame( $latest_stable, trim( $matches[0] ), "SECURITY.md's version needs to be updated to $latest_stable." );
</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">- function test_package_json() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_package_json() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $package_json = file_get_contents( dirname( ABSPATH ) . '/package.json' );
</span><span class="cx" style="display: block; padding: 0 10px"> $package_json = json_decode( $package_json, true );
</span><span class="cx" style="display: block; padding: 0 10px"> list( $version ) = explode( '-', $GLOBALS['wp_version'] );
</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"> * @depends test_package_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">- function test_package_json_node_engine( $package_json ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_package_json_node_engine( $package_json ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'engines', $package_json );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'node', $package_json['engines'] );
</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">
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_ws() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_ws() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', strip_ws( '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', strip_ws( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', strip_ws( "\r\n\t \n\r\t" ) );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mask_input_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mask_input_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $in = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <h2>Assign Authors</h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.</p>
</span></span></pre></div>
<a id="trunktestsphpunittestsblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template-utils.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> wp_delete_post( 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">- function test_build_template_result_from_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_build_template_result_from_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template = _build_template_result_from_post(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post,
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_template'
</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"> * Should retrieve the template from the 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">- function test_get_block_template_from_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_template_from_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = get_stylesheet() . '//' . 'my_template';
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, $template->id );
</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"> * Should retrieve block templates.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_templates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_templates() {
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_template_ids( $templates ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array_map(
</span><span class="cx" style="display: block; padding: 0 10px"> static function( $template ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsblocktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/block-template.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Regression: https://github.com/WordPress/gutenberg/issues/31399.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_custom_page_php_template_takes_precedence_over_all_other_templates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_page_php_template_takes_precedence_over_all_other_templates() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $custom_page_template = 'templates/full-width.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_page_template_path = get_stylesheet_directory() . '/' . $custom_page_template;
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'page';
</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"> * Covers: https://github.com/WordPress/gutenberg/pull/30438.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_custom_page_block_template_takes_precedence_over_all_other_templates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_page_block_template_takes_precedence_over_all_other_templates() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_current_template_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_page_block_template = 'wp-custom-template-my-block-template';
</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"> * Regression: https://github.com/WordPress/gutenberg/issues/31652.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_template_remains_unchanged_if_templates_array_is_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_template_remains_unchanged_if_templates_array_is_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $resolved_template_path = locate_block_template( '', 'search', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $resolved_template_path );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblockscontextphp"></a>
<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/context.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/context.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/context.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_provides_block_context() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_provides_block_context() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $provided_context = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_block_type(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_provides_default_context() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_provides_default_context() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $provided_context = array();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_context_is_filterable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_context_is_filterable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $provided_context = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_block_type(
</span></span></pre></div>
<a id="trunktestsphpunittestsblockseditorphp"></a>
<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/editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/editor.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/editor.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> parent::tear_down();
</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">- function filter_set_block_categories_post( $block_categories, $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_block_categories_post( $block_categories, $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_categories;
</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"> );
</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">- function filter_set_allowed_block_types_post( $allowed_block_types, $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_allowed_block_types_post( $allowed_block_types, $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $allowed_block_types;
</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"> return array( 'test/filtered-block' );
</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">- function filter_set_block_editor_settings_post( $editor_settings, $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_block_editor_settings_post( $editor_settings, $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $allowed_block_types;
</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"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_editor_context_no_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_editor_context_no_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $context = new WP_Block_Editor_Context();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $context->post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_editor_context_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_editor_context_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post(), $context->post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated block_categories
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_categories_deprecated_filter_post_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_categories_deprecated_filter_post_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_categories', array( $this, 'filter_set_block_categories_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $block_categories = get_block_categories( get_post() );
</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"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated block_categories
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_categories_deprecated_filter_post_editor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_categories_deprecated_filter_post_editor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_categories', array( $this, 'filter_set_block_categories_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</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"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_allowed_block_types_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_allowed_block_types_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_block_types = get_allowed_block_types( $post_editor_context );
</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"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated allowed_block_types
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_allowed_block_types_deprecated_filter_post_editor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_allowed_block_types_deprecated_filter_post_editor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'allowed_block_types', array( $this, 'filter_set_allowed_block_types_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</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"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_default_block_editor_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_default_block_editor_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = get_default_block_editor_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 16, $settings );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53397
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_legacy_widget_block_editor_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_legacy_widget_block_editor_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = get_legacy_widget_block_editor_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $settings );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_editor_settings_overrides_default_settings_all_editors() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_editor_settings_overrides_default_settings_all_editors() {
</ins><span class="cx" style="display: block; padding: 0 10px"> function filter_allowed_block_types_my_editor() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'test/filtered-my-block' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53458
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_editor_settings_theme_json_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_editor_settings_theme_json_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated block_editor_settings
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_editor_settings_deprecated_filter_post_editor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_editor_settings_deprecated_filter_post_editor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_editor_settings', array( $this, 'filter_set_block_editor_settings_post' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_editor_rest_api_preload_no_paths() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_editor_rest_api_preload_no_paths() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_context = new WP_Block_Editor_Context();
</span><span class="cx" style="display: block; padding: 0 10px"> block_editor_rest_api_preload( array(), $editor_context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated block_editor_preload_paths
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_editor_rest_api_preload_deprecated_filter_post_editor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_editor_rest_api_preload_deprecated_filter_post_editor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> function filter_remove_preload_paths( $preload_paths, $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $preload_paths;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_editor_rest_api_preload_filter_all() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_editor_rest_api_preload_filter_all() {
</ins><span class="cx" style="display: block; padding: 0 10px"> function filter_add_preload_paths( $preload_paths, WP_Block_Editor_Context $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $context->post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_push( $preload_paths, array( '/wp/v2/types', 'OPTIONS' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53344
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_block_editor_theme_styles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_block_editor_theme_styles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_styles = get_block_editor_theme_styles();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $theme_styles );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/register.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Empty render function for tests to use.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function render_stub() {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_stub() {}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tear down after each test.
</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"> * @since 5.0.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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'core/test-static', 'core/test-dynamic', 'tests/notice' ) as $block_name ) {
</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"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_set_locale_to_polish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_locale_to_polish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'pl_PL';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45109
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_affects_main_registry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_affects_main_registry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = 'core/test-static';
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'icon' => 'text',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45109
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unregister_affects_main_registry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unregister_affects_main_registry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = 'core/test-static';
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'icon' => 'text',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_does_not_remove_block_asset_path_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_does_not_remove_block_asset_path_prefix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = remove_block_asset_path_prefix( 'script-handle' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'script-handle', $result );
</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"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_block_asset_path_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_block_asset_path_prefix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = remove_block_asset_path_prefix( 'file:./block.js' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( './block.js', $result );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_generate_block_asset_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_generate_block_asset_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_name = 'unit-tests/my-block';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> * @ticket 50328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_generate_block_asset_handle_core_block() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_generate_block_asset_handle_core_block() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_name = 'core/paragraph';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_field_not_found_register_block_script_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_field_not_found_register_block_script_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_script_handle( array(), 'script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</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"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_value_register_block_script_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_value_register_block_script_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array( 'script' => '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_script_handle( $metadata, 'script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @expectedIncorrectUsage register_block_script_handle
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_missing_asset_file_register_block_script_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_missing_asset_file_register_block_script_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => __FILE__,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'unit-tests/test-block',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_passed_register_block_script_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_passed_register_block_script_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'editorScript' => 'test-script-handle',
</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"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_success_register_block_script_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_success_register_block_script_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => DIR_TESTDATA . '/blocks/notice/block.json',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'unit-tests/test-block',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_field_not_found_register_block_style_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_field_not_found_register_block_style_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_style_handle( array(), 'style' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_value_found_register_block_style_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_value_found_register_block_style_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array( 'style' => '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_style_handle( $metadata, 'style' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_passed_register_block_style_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_passed_register_block_style_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => 'test-style-handle',
</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"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_success_register_block_style_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_success_register_block_style_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => DIR_TESTDATA . '/blocks/notice/block.json',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'unit-tests/test-block',
</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"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_metadata_not_found_in_wordpress_core() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_metadata_not_found_in_wordpress_core() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_type_from_metadata( 'unknown' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</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"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_metadata_not_found_in_the_current_directory() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_metadata_not_found_in_the_current_directory() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_type_from_metadata( __DIR__ );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50263
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_registers_with_metadata_fixture() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_registers_with_metadata_fixture() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_type_from_metadata(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/blocks/notice'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,7 +414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53233
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_register_block_type_proxy_for_metadata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_register_block_type_proxy_for_metadata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_type(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/blocks/notice'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52301
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_registers_with_metadata_i18n_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_registers_with_metadata_i18n_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> load_textdomain( 'notice', WP_LANG_DIR . '/plugins/notice-pl_PL.mo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45109
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_dynamic_block_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_dynamic_block_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type( 'core/test-static', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> register_block_type( 'core/test-dynamic', array( 'render_callback' => array( $this, 'render_stub' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 45109
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_blocks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_blocks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test with passing post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_blocks( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksrenderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/blocks/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/render.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/render.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> $this->assertSame( trim( $classic_filtered_content ), trim( $block_filtered_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">- function handle_shortcode( $atts, $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function handle_shortcode( $atts, $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 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"> * @ticket 45495
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nested_calls_to_the_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nested_calls_to_the_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/test',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> $this->assertSame( $content, $the_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">- function dynamic_the_content_call( $attrs, $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function dynamic_the_content_call( $attrs, $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> apply_filters( 'the_content', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksserializephp"></a>
<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/serialize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/serialize.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/serialize.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_serialize_identity_from_parsed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_serialize_identity_from_parsed( $original ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialize_identity_from_parsed( $original ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blocks = parse_blocks( $original );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = serialize_blocks( $blocks );
</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"> $this->assertSame( $expected, $actual );
</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">- function data_serialize_identity_from_parsed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_serialize_identity_from_parsed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Void block.
</span><span class="cx" style="display: block; padding: 0 10px"> array( '<!-- wp:void /-->' ),
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_serialized_block_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_block_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( strip_core_block_namespace( null ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'example', strip_core_block_namespace( 'example' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'example', strip_core_block_namespace( 'core/example' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsblockswpBlockphp"></a>
<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/wpBlock.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/wpBlock.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/wpBlock.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> parent::tear_down();
</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">- function filter_render_block( $content, $parsed_block ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_render_block( $content, $parsed_block ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'Original: "' . $content . '", from block "' . $parsed_block['blockName'] . '"';
</span><span class="cx" style="display: block; padding: 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,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_assigns_properties_from_parsed_block() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_assigns_properties_from_parsed_block() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( 'core/example', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_blocks = parse_blocks( '<!-- wp:example {"ok":true} -->a<!-- wp:example /-->b<!-- /wp:example -->' );
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_assigns_block_type_from_registry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_assigns_block_type_from_registry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_type_settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'defaulted' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_lazily_assigns_attributes_with_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_lazily_assigns_attributes_with_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/example',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_lazily_assigns_attributes_with_only_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_lazily_assigns_attributes_with_only_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/example',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_assigns_context_from_block_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_assigns_context_from_block_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/example',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_maps_inner_blocks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_maps_inner_blocks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( 'core/example', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_blocks = parse_blocks( '<!-- wp:example {"ok":true} -->a<!-- wp:example /-->b<!-- /wp:example -->' );
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_prepares_context_for_inner_blocks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_prepares_context_for_inner_blocks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/outer',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_assigns_merged_context() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_assigns_merged_context() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/example',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_static_block_type_returns_own_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_static_block_type_returns_own_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( 'core/static', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/dynamic',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_passes_block_for_render_callback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_passes_block_for_render_callback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/greeting',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_applies_render_block_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_applies_render_block_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( 'core/example', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'render_block', array( $this, 'filter_render_block' ), 10, 2 );
</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"> * @ticket 46187
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_applies_dynamic_render_block_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_applies_dynamic_render_block_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( 'core/example', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'render_block_core/example', array( $this, 'filter_render_block' ), 10, 2 );
</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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_passes_attributes_to_render_callback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_passes_attributes_to_render_callback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/greeting',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_passes_content_to_render_callback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_passes_content_to_render_callback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/outer',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsblockswpBlockListphp"></a>
<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/wpBlockList.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/wpBlockList.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/wpBlockList.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_array_access() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_array_access() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_blocks = parse_blocks( '<!-- wp:example /-->' );
</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="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"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_iterable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_iterable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_blocks = parse_blocks( '<!-- wp:example --><!-- wp:example /--><!-- /wp:example -->' );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49927
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_countable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_countable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_blocks = parse_blocks( '<!-- wp:example /-->' );
</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></pre></div>
<a id="trunktestsphpunittestsblockswpBlockTypephp"></a>
<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/wpBlockType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/wpBlockType.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/blocks/wpBlockType.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45145
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_attributes_none_defined() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_attributes_none_defined() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = array( 'exists' => 'keep' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $block_type = new WP_Block_Type( 'core/dummy', array() );
</span></span></pre></div>
<a id="trunktestsphpunittestscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cache.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/cache.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Cache extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public $cache = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> // Create two cache objects with a shared cache directory.
</span><span class="cx" style="display: block; padding: 0 10px"> // This simulates a typical cache situation, two separate requests interacting.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache =& $this->init_cache();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->flush_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function &init_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function &init_cache() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_object_cache;
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_class = get_class( $wp_object_cache );
</span><span class="cx" style="display: block; padding: 0 10px"> $cache = new $cache_class();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,11 +26,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $cache;
</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">- function test_miss() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_miss() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->cache->get( 'test_miss' ) );
</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">- function test_add_get() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_get() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $val, $this->cache->get( $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">- function test_add_get_0() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_get_0() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = 0;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20004
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_get_null() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_get_null() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = null;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20004
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_get_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_get_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = false;
</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"> $this->assertSame( $val, $this->cache->get( $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">- function test_add() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val1 = 'val1';
</span><span class="cx" style="display: block; padding: 0 10px"> $val2 = 'val2';
</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"> $this->assertSame( $val1, $this->cache->get( $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">- function test_replace() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replace() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = 'val1';
</span><span class="cx" style="display: block; padding: 0 10px"> $val2 = 'val2';
</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"> $this->assertSame( $val2, $this->cache->get( $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">- function test_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val1 = 'val1';
</span><span class="cx" style="display: block; padding: 0 10px"> $val2 = 'val2';
</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"> $this->assertSame( $val2, $this->cache->get( $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">- function test_flush() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_flush() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_using_ext_object_cache;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_wp_using_ext_object_cache ) {
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure objects are cloned going to and from the cache.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_object_refs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_object_refs() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $object_a = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $object_a->foo = 'alpha';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'bravo', $object_a->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">- function test_incr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->cache->incr( $key ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, $this->cache->get( $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">- function test_wp_cache_incr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_cache_incr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_incr( $key ) );
</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"> $this->assertSame( 3, wp_cache_get( $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">- function test_decr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_decr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->cache->decr( $key ) );
</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"> * @ticket 21327
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_cache_decr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_cache_decr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_decr( $key ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, wp_cache_get( $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">- function test_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->cache->delete( $key, 'default' ) );
</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">- function test_wp_cache_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_cache_delete() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_delete( $key, 'default' ) );
</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">- function test_switch_to_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switch_to_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! method_exists( $this->cache, 'switch_to_blog' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test requires a switch_to_blog() method on the cache object.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $val2, $this->cache->get( $key, 'global-cache-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">- function test_wp_cache_init() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_cache_init() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_blank_cache_object = new WP_Object_Cache();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</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"> }
</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">- function test_wp_cache_replace() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_cache_replace() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'my-key';
</span><span class="cx" style="display: block; padding: 0 10px"> $val1 = 'first-val';
</span><span class="cx" style="display: block; padding: 0 10px"> $val2 = 'second-val';
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalcustomRulesphp"></a>
<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/customRules.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/customRules.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical/customRules.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Canonical_CustomRules extends WP_Canonical_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a custom Rewrite rule to test category redirections.
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider 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">- function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCanonical( $test_url, $expected, $ticket, $expected_doing_it_wrong );
</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">- function data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Data format:
</span><span class="cx" style="display: block; padding: 0 10px"> * [0]: Test URL.
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical/https.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Canonical_HTTPS extends WP_Canonical_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalnoRewritephp"></a>
<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/noRewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/noRewrite.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical/noRewrite.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,11 +24,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider 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">- function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCanonical( $test_url, $expected, $ticket, $expected_doing_it_wrong );
</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">- function data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Test URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * [0]: Test URL.
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpageOnFrontphp"></a>
<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/pageOnFront.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/pageOnFront.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical/pageOnFront.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Canonical_PageOnFront extends WP_Canonical_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,11 +35,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider 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">- function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCanonical( $test_url, $expected, $ticket, $expected_doing_it_wrong );
</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">- function data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Data format:
</span><span class="cx" style="display: block; padding: 0 10px"> * [0]: Test URL.
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpagedphp"></a>
<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/paged.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/paged.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical/paged.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Canonical_Paged extends WP_Canonical_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirect_canonical_with_nextpage_pagination() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirect_canonical_with_nextpage_pagination() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $para = 'This is a paragraph.
</span><span class="cx" style="display: block; padding: 0 10px"> This is a paragraph.
</span><span class="cx" style="display: block; padding: 0 10px"> This is a paragraph.';
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpostStatusphp"></a>
<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/postStatus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/postStatus.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical/postStatus.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> wp_trash_post( self::$posts['trash-page']->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> self::setup_custom_types();
</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"> * @type string $expected Expected 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">- function data_canonical_redirects_to_plain_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_canonical_redirects_to_plain_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $all_user_list = array( 'anon', 'subscriber', 'content_author', 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $select_allow_list = array( 'content_author', 'editor' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +584,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $expected Expected 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">- function data_canonical_redirects_to_pretty_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_canonical_redirects_to_pretty_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $all_user_list = array( 'anon', 'subscriber', 'content_author', 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $select_allow_list = array( 'content_author', 'editor' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/canonical.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_canonical
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_canonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_canonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $test_url, '%d' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $test_url, '/?author=%d' ) ) {
</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->assertCanonical( $test_url, $expected, $ticket, $expected_doing_it_wrong );
</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">- function data_canonical() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_canonical() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Data format:
</span><span class="cx" style="display: block; padding: 0 10px"> * [0]: Test URL.
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/category.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Category extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_all_category_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">- function test_get_all_category_ids() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_all_category_ids() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Ccreate categories.
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->category->create_many( 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * Validate get_category_by_slug function
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_category_by_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_category_by_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create test categories.
</span><span class="cx" style="display: block; padding: 0 10px"> $testcat = self::factory()->category->create_and_get(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Validate _make_cat_compat function
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test__make_cat_compat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__make_cat_compat() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create test categories and array representations.
</span><span class="cx" style="display: block; padding: 0 10px"> $testcat_array = array(
</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"> * Validate get_cat_name function
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_cat_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_cat_name() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create test category.
</span><span class="cx" style="display: block; padding: 0 10px"> $testcat = self::factory()->category->create_and_get(
</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"> * Validate get_cat_name function
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_cat_ID() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_cat_ID() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create test category.
</span><span class="cx" style="display: block; padding: 0 10px"> $testcat = self::factory()->category->create_and_get(
</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"> * Validate get_category_by_path function
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_category_by_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_category_by_path() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create test categories.
</span><span class="cx" style="display: block; padding: 0 10px"> $root_id = self::factory()->category->create(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * setUp 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->option_page_comments = get_option( 'page_comments' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->option_page_comments = get_option( 'comments_per_page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * tearDown 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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_comments', $this->option_page_comments );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comments_per_page', $this->option_page_comments );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'thread_comments', $this->option_page_comments );
</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"> * Validate get_comments_pages_count for empty 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">- function test_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Setup post and comments.
</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"> array(
</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"> * Validate get_comments_pages_count for treaded 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">- function test_threaded_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_threaded_comments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Setup post and comments.
</span><span class="cx" style="display: block; padding: 0 10px"> $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">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Validate get_comments_pages_count for option tread_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">- function test_option_thread_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_option_thread_comments() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Setup post and comments.
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</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"> * Validate $wp_query logic of get_comment_pages_count
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_query_comments_per_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_query_comments_per_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_rss', 100 );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Validate max_num_comment_pages logic of get_comment_pages_count
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_max_num_comment_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_max_num_comment_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/query.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment/query.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1284,7 +1284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $comments[2] ), $q->comments );
</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">- function test_get_comments_for_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_for_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $limit = 5;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1344,7 +1344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21003
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_orderby_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_orderby_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id2 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id3 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1596,7 +1596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27064
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_comments_by_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_by_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $users = self::factory()->user->create_many( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> 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">@@ -1689,7 +1689,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28434
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_ids_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_ids_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_1 = self::factory()->comment->create(
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1725,7 +1725,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_comment__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_comment__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_1 = self::factory()->comment->create(
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1761,7 +1761,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_comment__not_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_comment__not_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_1 = self::factory()->comment->create(
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1797,7 +1797,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_post__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_post__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p1 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p2 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p3 = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1837,7 +1837,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_post__not_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_post__not_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p1 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p2 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p3 = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1877,7 +1877,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29885
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_post_author__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_post_author__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id1 = 105;
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id2 = 106;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1920,7 +1920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29885
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_post_author__not_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_post_author__not_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id1 = 111;
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id2 = 112;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1963,7 +1963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29885
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_author__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_author__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p1 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p2 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p3 = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2011,7 +2011,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29885
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_author__not_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_author__not_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p1 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p2 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $p3 = self::factory()->post->create();
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$post_id = $factory->post->create();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the extended model function that expects slashed 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">- function test_wp_new_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_new_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> // Not testing comment_author_email or comment_author_url
</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"> * Tests the controller function that expects slashed 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">- function test_edit_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_id;
</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">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_insert_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> $comment_id = wp_insert_comment(
</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"> * Tests the model function that expects slashed 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">- function test_wp_update_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_id;
</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></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment/template.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_id = self::factory()->post->create();
</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">- function test_get_comments_number() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_number() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> $this->assertSame( 0, get_comments_number( 0 ) );
</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->assertSame( '12', get_comments_number( get_post( $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">- function test_get_comments_number_without_arg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_number_without_arg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_id;
</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="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"> * @ticket 48772
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_comments_number_text_with_post_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_number_text_with_post_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->comment->create_post_comments( $post_id, 6 );
</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"> * @ticket 13651
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_comments_number_text_declension_with_default_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_number_text_declension_with_default_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_id;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13651
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_comments_number_text_declension
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_comments_number_text_declension_with_custom_args( $number, $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_comments_number_text_declension_with_custom_args( $number, $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_id;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,14 +97,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->comment->create_post_comments( $post_id, $number );
</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">- add_filter( 'gettext_with_context', array( $this, '_enable_comment_number_declension' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'gettext_with_context', array( $this, 'enable_comment_number_declension' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $output, get_comments_number_text( false, false, $input ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'gettext_with_context', array( $this, '_enable_comment_number_declension' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'gettext_with_context', array( $this, 'enable_comment_number_declension' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _enable_comment_number_declension( $translation, $text, $context, $domain ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function enable_comment_number_declension( $translation, $text, $context, $domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'Comment number declension: on or off' === $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translation = 'on';
</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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_get_comments_number_text_declension() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_get_comments_number_text_declension() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 2,
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwalkerphp"></a>
<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/walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/walker.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment/walker.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Comment_Walker extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_id = self::factory()->post->create();
</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"> * @ticket 14041
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_children() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_children() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_parent = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_child = self::factory()->comment->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment-submission.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::delete_user( self::$editor_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-phpass.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/comment.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_comment_is_wp_error() {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => self::$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">- add_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_update_comment_data', array( $this, 'wp_update_comment_data_filter' ), 10, 3 );
</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">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 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">- remove_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_update_comment_data', array( $this, 'wp_update_comment_data_filter' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $result );
</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"> * Blocks comments from being updated by returning WP_Error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _wp_update_comment_data_filter( $data, $comment, $commentarr ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_update_comment_data_filter( $data, $comment, $commentarr ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'comment_wrong', 'wp_update_comment_data filter fails for this comment.', 500 );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/cron.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> private $plus_thirty_minutes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the schedule is clear.
</span><span class="cx" style="display: block; padding: 0 10px"> _set_cron_array( array() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,19 +24,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plus_thirty_minutes = strtotime( '+30 minutes' );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure the schedule is clear.
</span><span class="cx" style="display: block; padding: 0 10px"> _set_cron_array( array() );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_wp_get_schedule_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_schedule_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Nothing scheduled.
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_schedule( $hook ) );
</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">- function test_schedule_event_single() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_schedule_event_single() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Schedule an event and make sure it's returned by wp_next_scheduled().
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_schedule_event_single_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_schedule_event_single_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Schedule an event with arguments and make sure it's returned by wp_next_scheduled().
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = 'event';
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</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"> $this->assertFalse( wp_get_schedule( $hook, $args ) );
</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">- function test_schedule_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_schedule_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Schedule an event and make sure it's returned by wp_next_scheduled().
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $recur = 'hourly';
</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"> $this->assertSame( $recur, wp_get_schedule( $hook ) );
</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">- function test_schedule_event_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_schedule_event_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Schedule an event and make sure it's returned by wp_next_scheduled().
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = 'event';
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_schedule_event
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_schedule_event_without_cron_option_does_not_throw_warning() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_schedule_event_without_cron_option_does_not_throw_warning() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'cron' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify that the cause of the error is in place.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_schedule_single_event
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_schedule_single_event_without_cron_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_schedule_single_event_without_cron_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'cron' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify that the cause of the error is in place.
</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"> $this->assertNotContains( false, get_option( 'cron' ), 'Resulting cron array contains the value "false"' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unschedule_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unschedule_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Schedule an event and make sure it's returned by wp_next_scheduled().
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</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"> $this->assertFalse( wp_next_scheduled( $hook ) );
</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">- function test_clear_schedule() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clear_schedule() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_next_scheduled( $hook, $args ) );
</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">- function test_clear_undefined_schedule() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clear_undefined_schedule() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</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"> $this->assertSame( 0, $hook_unscheduled );
</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">- function test_clear_schedule_multiple_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clear_schedule_multiple_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1', 'arg2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 10468
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_clear_schedule_new_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clear_schedule_new_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $multi_hook = __FUNCTION__ . '_multi';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18997
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unschedule_hook() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unschedule_hook() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_next_scheduled( $hook ) );
</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">- function test_unschedule_undefined_hook() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unschedule_undefined_hook() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $unrelated_hook = __FUNCTION__ . '_two';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6966
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_duplicate_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_duplicate_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Duplicate events close together should be skipped.
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</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"> * @ticket 6966
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_not_duplicate_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_not_duplicate_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Duplicate events far apart should work normally.
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ts1, wp_next_scheduled( $hook, $args ) );
</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">- function test_not_duplicate_event_reversed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_not_duplicate_event_reversed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Duplicate events far apart should work normally regardless of order.
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32656
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_schedule_event_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_schedule_event_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+30 minutes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = _get_cron_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">- add_filter( 'pre_schedule_event', array( $this, '_filter_pre_schedule_event_filter' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_schedule_event', array( $this, 'filter_pre_schedule_event_filter' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_schedule_event( $ts2, 'hourly', $hook ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the scheduling of events to use the preflight 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">- function _filter_pre_schedule_event_filter( $null, $event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_schedule_event_filter( $null, $event ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = md5( serialize( $event->args ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->preflight_cron_array[ $event->timestamp ][ $event->hook ][ $key ] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32656
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_reschedule_event_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_reschedule_event_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+30 minutes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32656
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_unschedule_event_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_unschedule_event_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+30 minutes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32656
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_clear_scheduled_hook_filters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_clear_scheduled_hook_filters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+30 minutes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32656
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_scheduled_event_hooks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_scheduled_event_hooks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_scheduled_event', array( $this, 'filter_pre_scheduled_event_hooks' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_get_scheduled_event( 'preflight_event', array(), $this->plus_thirty_minutes );
</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"> $this->assertSame( $expected->timestamp, $actual2 );
</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">- function filter_pre_scheduled_event_hooks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_scheduled_event_hooks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hook' => 'preflight_event',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timestamp' => $this->plus_thirty_minutes,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +541,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45976.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_scheduled_event_singles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_scheduled_event_singles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts_late = strtotime( '+30 minutes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +584,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45976.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_scheduled_event_recurring() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_scheduled_event_recurring() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts_late = strtotime( '+30 minutes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45976.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_scheduled_event_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_scheduled_event_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts = strtotime( '+3 minutes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44818
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_duplicate_past_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_duplicate_past_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '-14 minutes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +680,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44818
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_duplicate_near_future_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_duplicate_near_future_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+4 minutes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44818
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_duplicate_future_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_duplicate_future_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+15 minutes' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44818
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_not_duplicate_future_event() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_not_duplicate_future_event() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ts1 = strtotime( '+15 minutes' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizecontrolphp"></a>
<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/control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/control.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/control.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Set up.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</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"> * @see WP_Customize_Control::check_capabilities()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_capabilities() {
</ins><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"> $control = new WP_Customize_Control(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize,
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38164
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dropdown_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dropdown_pages() {
</ins><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"> $this->assertInstanceOf( 'WP_Customize_Nav_Menus', $this->wp_customize->nav_menus );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tear down.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizecustomcsssettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/custom-css-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/custom-css-setting.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/custom-css-setting.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @see WP_UnitTestCase::setup()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tear down the test case.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setting = null;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete the $wp_customize global when cleaning up scope.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</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"> * @covers WP_Customize_Custom_CSS_Setting::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( post_type_exists( 'custom_css' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'custom_css', $this->setting->type );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_stylesheet(), $this->setting->stylesheet );
</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"> * @covers WP_Customize_Custom_CSS_Setting::preview
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Custom_CSS_Setting::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_crud() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_crud() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->setting->default, $this->setting->value() );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39032
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_custom_css_revision_saved() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_css_revision_saved() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inserted_css = 'body { background: black; }';
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_css = 'body { background: red; }';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39259
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_custom_css_post_queries_after_failed_lookup() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_css_post_queries_after_failed_lookup() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'custom_css_post_id', -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $queries_before = get_num_queries();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_custom_css_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39259
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_custom_css_updates_theme_mod() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_custom_css_updates_theme_mod() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'custom_css_post_id', -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = wp_update_custom_css_post( 'body { background: blue; }' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post->ID, get_theme_mod( 'custom_css_post_id' ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Custom_CSS_Setting::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">- function test_value_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_filter() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '/*default*//*filtered*/', $this->setting->value() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Setting $setting Setting.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_value( $value, $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_value( $value, $setting ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Custom_CSS_Setting', $setting );
</span><span class="cx" style="display: block; padding: 0 10px"> $value .= '/*filtered*/';
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Custom_CSS_Setting::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_css = 'body { color:red; }';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $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">@@ -343,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $args Args.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array 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">- function filter_update_custom_css_data( $data, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_update_custom_css_data( $data, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 'css', 'preprocessed' ), array_keys( $data ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $data['preprocessed'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Custom_CSS_Setting::validate
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_validate() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_validate() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Empty CSS throws no errors.
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->setting->validate( '' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/manager.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Set up 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager = $this->instantiate();
</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"> * Tear down 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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST = array();
</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"> * @throws Exception If an inactive core Twenty* theme cannot be found.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Theme slug (stylesheet).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_inactive_core_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_inactive_core_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_get_themes() as $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->stylesheet !== $stylesheet && 0 === strpos( $theme->stylesheet, 'twenty' ) ) {
</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"> * @return WP_Customize_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">- function instantiate() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function instantiate() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> return $GLOBALS['wp_customize'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = 'twentyfifteen';
</span><span class="cx" style="display: block; padding: 0 10px"> $messenger_channel = 'preview-123';
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::setup_theme
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_setup_theme_in_customize_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_setup_theme_in_customize_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $pagenow, $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenow = 'customize.php';
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'customize' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _delete_option_fresh_site()
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 41039
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fresh_site_flag_clearing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fresh_site_flag_clearing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure fresh site flag is cleared when publishing a changeset.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::setup_theme
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_setup_theme_in_frontend() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_setup_theme_in_frontend() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize, $pagenow, $show_admin_bar;
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenow = 'front';
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</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"> * @ticket 39221
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::settings_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">- function test_settings_previewed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_settings_previewed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = new WP_Customize_Manager( array( 'settings_previewed' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $wp_customize->settings_previewed() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::changeset_uuid
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_changeset_uuid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_changeset_uuid() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $uuid, $wp_customize->changeset_uuid() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +398,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::wp_loaded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_loaded() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_loaded() {
</ins><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"> $wp_customize = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Hello World';
</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"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::find_changeset_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">- function test_find_changeset_post_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_find_changeset_post_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $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">@@ -441,7 +441,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::changeset_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">- function test_changeset_post_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_changeset_post_id() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $wp_customize->changeset_post_id() );
</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"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::changeset_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">- function test_changeset_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_changeset_data() {
</ins><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><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"> * @covers WP_Customize_Manager::_save_starter_content_changeset
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_import_theme_starter_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_import_theme_starter_content() {
</ins><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"> register_nav_menu( 'top', 'Top' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-logo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,7 +811,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45484
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::import_theme_starter_content
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_import_theme_starter_content_with_nested_arrays() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_import_theme_starter_content_with_nested_arrays() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_published_home_page_id = $this->factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -885,7 +885,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::customize_preview_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">- function test_customize_preview_init() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_init() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test authorized admin user.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_user_id );
</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 40020
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::filter_iframe_security_headers
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_iframe_security_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_iframe_security_headers() {
</ins><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"> $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="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,7 +945,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::add_state_query_params
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_state_query_params() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_state_query_params() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_theme = $this->get_inactive_core_theme();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1004,7 +1004,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_save_changeset_post_without_theme_activation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_without_theme_activation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1421,7 +1421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $context Context.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array 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">- function filter_customize_changeset_save_data( $data, $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_changeset_save_data( $data, $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->customize_changeset_save_data_call_count += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $context );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1440,7 +1440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error Error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function return_illegal_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_illegal_error() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'illegal' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1451,7 +1451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::update_stashed_theme_mod_settings
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_changeset_post_with_theme_activation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_with_theme_activation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1489,7 +1489,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38705
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_save_changeset_post_with_varying_users() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_with_varying_users() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-background' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1664,7 +1664,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_delete_auto_drafts()
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_save_changeset_post_dumping_auto_draft_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_dumping_auto_draft_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1704,7 +1704,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38865
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_save_changeset_post_with_unchanged_values() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_with_unchanged_values() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-background' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1904,7 +1904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 41621
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_remove_setting_from_changeset_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_setting_from_changeset_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $manager = $this->create_test_manager( $uuid );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1940,7 +1940,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38705
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_save_changeset_post_with_varying_unfiltered_html_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_with_varying_unfiltered_html_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( self::$admin_user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$admin_user_id, 'unfiltered_html' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2012,7 +2012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::schedule_customize_register()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::customize_register()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_customize_publish_changeset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_customize_publish_changeset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2058,7 +2058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 41336
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_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">- function test_publish_changeset_with_future_status_when_future_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_publish_changeset_with_future_status_when_future_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = $this->create_test_manager( wp_generate_uuid4() );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -2079,7 +2079,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::save_changeset_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::get_changeset_post_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">- function test_save_changeset_post_for_bad_changeset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_changeset_post_for_bad_changeset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2150,7 +2150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Manager $wp_customize 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">- function register_scratchpad_setting( WP_Customize_Manager $wp_customize ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function register_scratchpad_setting( WP_Customize_Manager $wp_customize ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> 'scratchpad',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2167,7 +2167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string 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">- function filter_sanitize_scratchpad( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_sanitize_scratchpad( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'content_save_pre', $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2185,7 +2185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Setting $setting Setting.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed 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">- function filter_customize_setting_to_log_current_user( $value, $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_setting_to_log_current_user( $value, $setting ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->filtered_setting_current_user_ids[ $setting->id ] = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2196,7 +2196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::is_cross_domain
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_cross_domain() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_cross_domain() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', 'http://example.com' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2214,7 +2214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::get_allowed_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">- function test_get_allowed_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_allowed_urls() {
</ins><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->assertFalse( is_ssl() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $wp_customize->is_cross_domain() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2232,7 +2232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $urls URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array 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">- function filter_customize_allowed_urls( $urls ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_allowed_urls( $urls ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls[] = 'http://headless.example.com/';
</span><span class="cx" style="display: block; padding: 0 10px"> return $urls;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2242,7 +2242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ajax
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_doing_ajax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_doing_ajax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_doing_ajax', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $manager = $this->manager;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2256,7 +2256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test ! WP_Customize_Manager::doing_ajax().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_not_doing_ajax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_not_doing_ajax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_doing_ajax', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $manager = $this->manager;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2268,7 +2268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30988
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unsanitized_post_values_from_input() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unsanitized_post_values_from_input() {
</ins><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"> $manager = $this->manager;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2297,7 +2297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_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">- function test_unsanitized_post_values_with_changeset_and_stashed_theme_mods() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unsanitized_post_values_with_changeset_and_stashed_theme_mods() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_theme = $this->get_inactive_core_theme();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2421,7 +2421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30988
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_value() {
</ins><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"> $posted_settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'OOF',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2445,7 +2445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34893
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_post_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_value() {
</ins><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"> $default_value = 'foo_default';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $this->manager->add_setting(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2483,7 +2483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_sanitize_foo( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_sanitize_foo( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'return_null_in_sanitize' === $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = null;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_string( $value ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2502,7 +2502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_validate_foo( $validity, $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_validate_foo( $validity, $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $value, '<script' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $validity->add( 'invalid_value_in_validate', __( 'Invalid value.' ), array( 'source' => 'filter_customize_validate_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2514,7 +2514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37247
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_value_validation_sanitization_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_value_validation_sanitization_order() {
</ins><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"> $default_value = '0';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $this->manager->add_setting(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2539,7 +2539,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_sanitize_numeric( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_sanitize_numeric( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return absint( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2550,7 +2550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_validate_numeric( $validity, $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_validate_numeric( $validity, $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $value ) || ! is_numeric( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $validity->add( 'invalid_value_in_validate', __( 'Invalid value.' ), array( 'source' => 'filter_customize_validate_numeric' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2562,7 +2562,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::validate_setting_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">- function test_validate_setting_values() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_validate_setting_values() {
</ins><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"> $setting = $this->manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2611,7 +2611,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37638
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::validate_setting_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">- function test_late_validate_setting_values() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_late_validate_setting_values() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting = new Test_Setting_Without_Applying_Validate_Filter( $this->manager, 'required' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_setting( $setting );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2637,7 +2637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::validate_setting_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">- function test_validate_setting_values_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_validate_setting_values_args() {
</ins><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->manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2675,7 +2675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Setting $setting Setting.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error Validity.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function late_validate_length( $validity, $value, $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function late_validate_length( $validity, $value, $setting ) {
</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"> if ( strlen( $value ) < 10 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $validity->add( 'minlength', '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2688,7 +2688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37247
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_validate_setting_values_validation_sanitization_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_validate_setting_values_validation_sanitization_order() {
</ins><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"> $setting = $this->manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> 'numeric',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2709,7 +2709,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::prepare_setting_validity_for_js()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_setting_validity_for_js() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_setting_validity_for_js() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->manager->prepare_setting_validity_for_js( true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> $error->add( 'bad_letter', 'Bad letter', 'A' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2733,7 +2733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::set_post_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">- function test_set_post_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_post_value() {
</ins><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->manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2768,7 +2768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int 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">- function sanitize_foo_for_test_set_post_value( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function sanitize_foo_for_test_set_post_value( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return (int) $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2787,7 +2787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed ...$args Optional arguments passed to the 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">- function capture_customize_post_value_set_actions( ...$args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function capture_customize_post_value_set_actions( ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = current_action();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->captured_customize_post_value_set_actions[] = compact( 'action', 'args' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2797,7 +2797,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30936
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_dynamic_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_dynamic_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = $this->manager;
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_ids = array( 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting( 'foo', array( 'default' => 'foo_default' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2818,7 +2818,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38013
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::has_published_pages
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_published_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_published_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_pages() as $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $page->ID, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2847,7 +2847,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38013
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::has_published_pages
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_published_pages_when_nav_menus_created_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_published_pages_when_nav_menus_created_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_pages() as $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $page->ID, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2876,7 +2876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30936
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_dynamic_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_dynamic_settings() {
</ins><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"> $posted_settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'OOF',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2898,7 +2898,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * In lieu of closures, callback for customize_register action added in test_register_dynamic_settings().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function action_customize_register_for_dynamic_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_customize_register_for_dynamic_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_customize_dynamic_setting_args_for_test_dynamic_settings' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_customize_dynamic_setting_class_for_test_dynamic_settings' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2910,7 +2910,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $setting_id Setting ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function filter_customize_dynamic_setting_args_for_test_dynamic_settings( $setting_args, $setting_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_dynamic_setting_args_for_test_dynamic_settings( $setting_args, $setting_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $setting_id, array( 'foo', 'bar' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_args = array( 'default' => "dynamic_{$setting_id}_default" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2926,7 +2926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $setting_args Setting args.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_dynamic_setting_class_for_test_dynamic_settings( $setting_class, $setting_id, $setting_args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_dynamic_setting_class_for_test_dynamic_settings( $setting_class, $setting_id, $setting_args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WP_Customize_Setting', $setting_class );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $setting_args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2938,7 +2938,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::get_document_title_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_document_title_template() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_document_title_template() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tpl = $this->manager->get_document_title_template();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '%s', $tpl );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2949,7 +2949,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::get_preview_url()
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_preview_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url( '/' ), $this->manager->get_preview_url() );
</span><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2964,7 +2964,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::get_return_url()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::set_return_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">- function test_return_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_return_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'author' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url( '/' ), $this->manager->get_return_url() );
</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"> * @ticket 46686
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_return_url_with_deactivated_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_return_url_with_deactivated_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->set_return_url( admin_url( 'themes.php?page=mytheme_documentation' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( admin_url( 'themes.php' ), $this->manager->get_return_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3010,7 +3010,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::get_autofocus()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::set_autofocus()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_autofocus() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_autofocus() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $this->manager->get_autofocus() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->set_autofocus( array( 'unrecognized' => 'food' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3038,7 +3038,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::get_nonces()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nonces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nonces() {
</ins><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->assertIsArray( $nonces );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'save', $nonces );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3057,7 +3057,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Manager $manager Manager.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Nonces.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_refresh_nonces( $nonces, $manager ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_refresh_nonces( $nonces, $manager ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Manager', $manager );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonces['foo'] = wp_create_nonce( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $nonces;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3068,7 +3068,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::customize_pane_settings()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_pane_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_pane_settings() {
</ins><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->manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->prepare_controls();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3119,7 +3119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38867
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::remove_frameless_preview_messenger_channel
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remove_frameless_preview_messenger_channel() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_frameless_preview_messenger_channel() {
</ins><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"> $manager = new WP_Customize_Manager( array( 'messenger_channel' => null ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3139,7 +3139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::customize_preview_settings()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_preview_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_settings() {
</ins><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->manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->prepare_controls();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3171,7 +3171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33552
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_loaded_components_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_loaded_components_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Widgets', $manager->widgets );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Nav_Menus', $manager->nav_menus );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3203,7 +3203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Components.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function return_array_containing_widgets( $components, $customize_manager ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_array_containing_widgets( $components, $customize_manager ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $components );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'widgets', $components );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'nav_menus', $components );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3220,7 +3220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Components.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function return_array_containing_nav_menus( $components, $customize_manager ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_array_containing_nav_menus( $components, $customize_manager ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $components );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'widgets', $components );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'nav_menus', $components );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3233,7 +3233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30225
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34594
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_controls_stable_sorting() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_controls_stable_sorting() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $section_id = 'foo-section';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3273,7 +3273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34596
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_section_return_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_section_return_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3307,7 +3307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34596
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_setting_return_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_setting_return_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3328,7 +3328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34597
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_setting_honoring_dynamic() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_setting_honoring_dynamic() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3353,7 +3353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $id Setting ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Setting class.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function return_dynamic_customize_setting_class( $class, $id, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_dynamic_customize_setting_class( $class, $id, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $id, 'dynamic' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'Test_Dynamic_Customize_Setting';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3368,7 +3368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $id Setting ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Setting 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">- function return_dynamic_customize_setting_args( $args, $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_dynamic_customize_setting_args( $args, $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $id, 'dynamic' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['custom'] = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3378,7 +3378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34596
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_panel_return_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_panel_return_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3411,7 +3411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34596
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_control_return_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_control_return_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $section_id = 'foo-section';
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3459,7 +3459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_previewable_devices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_previewable_devices() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Setup the instance.
</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">@@ -3496,7 +3496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function filtered_device_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function filtered_device_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'custom-device' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Enter custom-device preview mode' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3512,7 +3512,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function filter_customize_previewable_devices( $devices ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_previewable_devices( $devices ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->filtered_device_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">@@ -3519,7 +3519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37128
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_controls_wp_list_sort_controls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_controls_wp_list_sort_controls() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $controls = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3552,7 +3552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37128
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_controls_wp_list_sort_sections() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_controls_wp_list_sort_sections() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $sections = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3581,7 +3581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37128
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_controls_wp_list_sort_panels() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_controls_wp_list_sort_panels() {
</ins><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $panels = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3612,7 +3612,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39125
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_external_header_video_trim() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_external_header_video_trim() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $this->manager->get_setting( 'external_header_video' );
</span><span class="cx" style="display: block; padding: 0 10px"> $video_url = 'https://www.youtube.com/watch?v=72xdCU__XCk';
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_UnitTestCase::setup()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</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">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete the $wp_customize global when cleaning up scope.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</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"> * @param object $menu_item Menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_type_label( $menu_item ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_type_label( $menu_item ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'custom_type' === $menu_item->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->type_label = 'Custom Label';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test constants and statics.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constants() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constants() {
</ins><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->assertTrue( post_type_exists( WP_Customize_Nav_Menu_Item_Setting::POST_TYPE ) );
</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"> * @see WP_Customize_Nav_Menu_Item_Setting::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><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><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"> * Test empty constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_empty_menus() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_empty_menus() {
</ins><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"> $_wp_customize = $this->wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_wp_customize->nav_menus );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_placeholder() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_placeholder() {
</ins><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"> $default = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Lorem',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::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">- function test_value_type_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_type_post_type() {
</ins><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"> $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
</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"> * @see WP_Customize_Nav_Menu_Item_Setting::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">- function test_value_type_post_type_without_label() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_type_post_type_without_label() {
</ins><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"> $original_title = 'Hello World';
</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><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::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">- function test_value_type_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_type_taxonomy() {
</ins><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"> $tax_id = self::factory()->category->create( array( 'name' => 'Salutations' ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::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">- function test_custom_type_label() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_type_label() {
</ins><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"> add_filter( 'wp_setup_nav_menu_item', array( $this, 'filter_type_label' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::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">- function test_value_nav_menu_term_id_returns_zero() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_nav_menu_term_id_returns_zero() {
</ins><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"> $menu_id = -123;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +345,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_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">- function test_preview_updated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_updated() {
</ins><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"> $first_post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_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">- function test_preview_inserted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_inserted() {
</ins><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"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_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">- function test_preview_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_deleted() {
</ins><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"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::sanitize()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize() {
</ins><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"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,7 +637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_updated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_updated() {
</ins><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"> $first_post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_inserted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_inserted() {
</ins><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"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,7 +779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_deleted() {
</ins><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"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,7 +831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33665
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_nav_menu_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_nav_menu_item() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'poem',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -888,7 +888,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_value_as_wp_post_nav_menu_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_as_wp_post_nav_menu_item() {
</ins><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><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">@@ -949,7 +949,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38945
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_value_as_wp_post_nav_menu_item_term_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_as_wp_post_nav_menu_item_term_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'press_release',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,7 +1022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38945
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menu_Item_Setting::get_original_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">- function test_get_original_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_original_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'press_release',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38015
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_value_as_wp_post_nav_menu_item_with_empty_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value_as_wp_post_nav_menu_item_with_empty_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_title = 'The Original Title';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_title' => $original_title ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_UnitTestCase::setup()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</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">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete the $wp_customize global when cleaning up scope.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</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"> * @return 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">- function get_nav_menu_items_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_nav_menu_items_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_option( 'nav_menu_options', array( 'auto_add' => array() ) );
</span><span class="cx" style="display: block; padding: 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test constants and statics.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constants() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constants() {
</ins><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->assertTrue( taxonomy_exists( WP_Customize_Nav_Menu_Setting::TAXONOMY ) );
</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"> * @see WP_Customize_Nav_Menu_Setting::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test empty constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_empty_menus() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_empty_menus() {
</ins><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"> $_wp_customize = $this->wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_wp_customize->nav_menus );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_placeholder() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_placeholder() {
</ins><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"> $default = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Lorem \\o/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::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">- function test_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_value() {
</ins><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"> $menu_name = 'Test 123 \\o/';
</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"> * @see WP_Customize_Nav_Menu_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">- function test_preview_updated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_updated() {
</ins><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"> $menu_id = wp_update_nav_menu_object(
</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"> * @see WP_Customize_Nav_Menu_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">- function test_preview_inserted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_inserted() {
</ins><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"> $menu_id = -123;
</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"> * @see WP_Customize_Nav_Menu_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">- function test_preview_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_deleted() {
</ins><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"> $menu_id = wp_update_nav_menu_object(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::sanitize()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize() {
</ins><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"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[123]' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_updated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_updated() {
</ins><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"> $menu_id = wp_update_nav_menu_object(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_inserted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_inserted() {
</ins><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"> $menu_id = -123;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_inserted_conflicted_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_inserted_conflicted_name() {
</ins><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"> $menu_name = 'Foo';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +489,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menu_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_deleted() {
</ins><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"> $menu_name = 'Lorem Ipsum \\o/';
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_UnitTestCase::setup()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</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">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete the $wp_customize global when cleaning up scope.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</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"> * @param array $items Menu item types.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Menu item types.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_item_types( $items ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_item_types( $items ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Custom',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => 'Custom Type',
</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"> * @param string $object The object name (e.g. category).
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_items( $items, $type, $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_items( $items, $type, $object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'custom-1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Cool beans',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><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"> $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="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_returns_wp_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_returns_wp_error() {
</ins><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"> // Invalid post type $obj_name.
</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"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_maybe_returns_home() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_maybe_returns_home() {
</ins><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"> // Expected menu item array.
</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"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_returns_post_item_with_page_number() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_returns_post_item_with_page_number() {
</ins><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"> // Create page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_returns_page_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_returns_page_item() {
</ins><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"> // Create page.
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_returns_post_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_returns_post_item() {
</ins><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"> // Create post.
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_returns_term_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_returns_term_item() {
</ins><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"> // Create term.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::load_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_load_available_items_query_returns_custom_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_available_items_query_returns_custom_item() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_nav_menu_available_items', array( $this, 'filter_items' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::search_available_items_query()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search_available_items_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_available_items_query() {
</ins><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"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Items.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_search( $items, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_search( $items, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $items );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 's', $args );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::enqueue_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">- function test_enqueue_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_scripts() {
</ins><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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $menus->enqueue_scripts();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::filter_dynamic_setting_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">- function test_filter_dynamic_setting_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_dynamic_setting_args() {
</ins><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"> $expected = array( 'type' => 'nav_menu_item' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::filter_dynamic_setting_class()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_dynamic_setting_class() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_dynamic_setting_class() {
</ins><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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +542,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::customize_register()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_register() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_register() {
</ins><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"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::intval_base10()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_intval_base10() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_intval_base10() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::available_item_types()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_available_item_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_available_item_types() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,7 +729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::print_templates()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_print_templates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_print_templates() {
</ins><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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,7 +753,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::available_items_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_available_items_template() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_available_items_template() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );
</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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::customize_dynamic_partial_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">- function test_customize_dynamic_partial_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_dynamic_partial_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'customize_dynamic_partial_args', false, 'nav_menu_instance[68b329da9893e34099c7d8ad5cb9c940]' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,7 +822,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::customize_preview_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">- function test_customize_preview_init() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_init() {
</ins><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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -837,7 +837,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::make_auto_draft_status_previewable
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_make_auto_draft_status_previewable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_auto_draft_status_previewable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_post_statuses;
</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"> $menus->make_auto_draft_status_previewable();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -849,7 +849,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::sanitize_nav_menus_created_posts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_nav_menus_created_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_nav_menus_created_posts() {
</ins><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"> $contributor_user_id = $this->factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_user_id = $this->factory()->user->create( array( 'role' => 'author' ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::save_nav_menus_created_posts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_save_nav_menus_created_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_save_nav_menus_created_posts() {
</ins><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"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::filter_wp_nav_menu_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">- function test_filter_wp_nav_menu_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_wp_nav_menu_args() {
</ins><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"> $menus = $this->wp_customize->nav_menus;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,7 +1117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::filter_wp_nav_menu
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Nav_Menus::filter_wp_nav_menu_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">- function test_filter_wp_nav_menu() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_wp_nav_menu() {
</ins><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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @see WP_Customize_Nav_Menus::customize_preview_enqueue_deps()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_preview_enqueue_deps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_enqueue_deps() {
</ins><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"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1172,7 +1172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::export_preview_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">- function test_export_preview_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_preview_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->nav_menus->export_preview_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $html = ob_get_clean();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1186,7 +1186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Nav_Menus::render_nav_menu_partial()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_nav_menu_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_nav_menu_partial() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->nav_menus->customize_preview_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu = wp_create_nav_menu( 'Foo' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizepanelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/panel.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/panel.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = new WP_Customize_Manager();
</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"> $this->undefined = new stdClass();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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"> * @see WP_Customize_Panel::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_default_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_default_args() {
</ins><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->assertIsInt( $panel->instance_number );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager, $panel->manager );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_custom_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_custom_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_posts',
</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"> * @see WP_Customize_Panel::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_custom_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_custom_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $panel = new Custom_Panel_Test( $this->manager, 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'titleless', $panel->type );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @see WP_Customize_Panel::active()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::active_callback()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_active() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_active() {
</ins><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->assertTrue( $panel->active() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Panel $panel
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_active_test( $active, $panel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_active_test( $active, $panel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $active );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Panel', $panel );
</span><span class="cx" style="display: block; padding: 0 10px"> $active = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::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">- function test_json() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_json() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_posts',
</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"> * @see WP_Customize_Panel::check_capabilities()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_capabilities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::get_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">- function test_get_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_content() {
</ins><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->assertEmpty( $panel->get_content() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @see WP_Customize_Panel::maybe_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">- function test_maybe_render() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_maybe_render() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel( $this->manager, 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $customize_render_panel_count = did_action( 'customize_render_panel' );
</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"> * @see WP_Customize_Panel::maybe_render()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Panel $panel
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function action_customize_render_panel_test( $panel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_customize_render_panel_test( $panel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Panel', $panel );
</span><span class="cx" style="display: block; padding: 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"> * @see WP_Customize_Panel::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_print_templates_standard() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_print_templates_standard() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::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"> $panel = new WP_Customize_Panel( $this->manager, 'baz' );
</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"> * @see WP_Customize_Panel::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_print_templates_custom() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_print_templates_custom() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::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"> $panel = new Custom_Panel_Test( $this->manager, 'baz' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizepartialphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/partial.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/partial.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/partial.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Set up.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = new WP_Customize_Manager();
</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"> * @see WP_Customize_Partial::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_default_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_default_args() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $partial_id, $partial->id );
</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"> * @param WP_Customize_Partial $partial Partial.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Content or false if error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function render_post_content_partial( $partial ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_post_content_partial( $partial ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id_data = $partial->id_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $id_data['keys'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_id ) ) {
</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"> * @see WP_Customize_Partial::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_non_default_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_non_default_args() {
</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(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Partial::id_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">- function test_id_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_id_data() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $id_data['base'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $container_context Data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false 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">- function filter_customize_partial_render( $rendered, $partial, $container_context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_partial_render( $rendered, $partial, $container_context ) {
</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->assertIsArray( $container_context );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $container_context Data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false 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">- function filter_customize_partial_render_with_id( $rendered, $partial, $container_context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_partial_render_with_id( $rendered, $partial, $container_context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'customize_partial_render_%s', $partial->id ), current_filter() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false === $rendered || is_string( $rendered ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Partial', $partial );
</span><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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string 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">- function render_echo_and_return() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_echo_and_return() {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> return 'bar';
</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"> * Echo render_callback().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function render_echo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_echo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '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">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string 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">- function render_return() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_return() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'bar';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Partial::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">- function test_render_with_bad_callback_should_give_preference_to_return_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_with_bad_callback_should_give_preference_to_return_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->selective_refresh,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Partial::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">- function test_render_echo_callback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_echo_callback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->selective_refresh,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</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"> * @see WP_Customize_Partial::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">- function test_render_return_callback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_return_callback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->selective_refresh,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Partial::render_callback()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_callback_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_callback_default() {
</ins><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"> $this->assertFalse( $partial->render_callback( $partial, array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( call_user_func( $partial->render_callback, $partial, array() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Partial::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">- function test_json() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_json() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = 123;
</span><span class="cx" style="display: block; padding: 0 10px"> $partial_id = sprintf( 'post_content[%d]', $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Partial::check_capabilities()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_capabilities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</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"> $partial = new WP_Customize_Partial(
</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"> * Tear down.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/section.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/section.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = new WP_Customize_Manager();
</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"> $this->undefined = new stdClass();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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"> * @see WP_Customize_Section::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_default_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_default_args() {
</ins><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->assertIsInt( $section->instance_number );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager, $section->manager );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_custom_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_custom_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_posts',
</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"> * @see WP_Customize_Section::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct_custom_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct_custom_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $section = new Custom_Section_Test( $this->manager, 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'titleless', $section->type );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::active()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::active_callback()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_active() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_active() {
</ins><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->assertTrue( $section->active() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Section $section
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_active_test( $active, $section ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_active_test( $active, $section ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $active );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Section', $section );
</span><span class="cx" style="display: block; padding: 0 10px"> $active = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::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">- function test_json() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_json() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_posts',
</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"> * @see WP_Customize_Section::check_capabilities()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_capabilities() {
</ins><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"> $section = new WP_Customize_Section( $this->manager, 'foo' );
</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"> * @see WP_Customize_Section::get_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">- function test_get_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_content() {
</ins><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->assertEmpty( $section->get_content() );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::maybe_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">- function test_maybe_render() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_maybe_render() {
</ins><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"> $section = new WP_Customize_Section( $this->manager, 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $customize_render_section_count = did_action( 'customize_render_section' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::maybe_render()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Section $section
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function action_customize_render_section_test( $section ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_customize_render_section_test( $section ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Section', $section );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @see WP_Customize_Section::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_print_templates_standard() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_print_templates_standard() {
</ins><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"> $section = new WP_Customize_Section( $this->manager, 'baz' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_print_templates_custom() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_print_templates_custom() {
</ins><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"> $section = new Custom_Section_Test( $this->manager, 'baz' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizeselectiverefreshajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Set up the test fixture.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Define wp_doing_ajax so that wp_die() will be used instead of die().
</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"> * Do Customizer boot actions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function do_customize_boot_actions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function do_customize_boot_actions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_METHOD'] = 'POST';
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'setup_theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'after_setup_theme' );
</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"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_render_partials_request_for_unauthenticated_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_render_partials_request_for_unauthenticated_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST[ WP_Customize_Selective_Refresh::RENDER_QUERY_VAR ] = '1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check current_user_cannot_customize.
</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"> * Set the current user to be an admin, add the preview nonce, and set the query var.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function setup_valid_render_partials_request_environment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function setup_valid_render_partials_request_environment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST['nonce'] = wp_create_nonce( 'preview-customize_' . $this->wp_customize->theme()->get_stylesheet() );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST[ WP_Customize_Selective_Refresh::RENDER_QUERY_VAR ] = '1';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_render_partials_request_for_unrecognized_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_render_partials_request_for_unrecognized_partial() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px"> $context_data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $placements = array( $context_data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_render_partials_request_for_non_rendering_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_render_partials_request_for_non_rendering_partial() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->add_setting( 'home' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_rendering_disallowed_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_rendering_disallowed_partial() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->add_setting(
</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"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_rendering_partial_with_missing_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_rendering_partial_with_missing_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->selective_refresh->add_partial( 'bar', array( 'settings' => 'bar' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $context Context data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function render_callback_blogname( $partial, $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_callback_blogname( $partial, $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $context );
</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"> return get_bloginfo( 'name', 'display' );
</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"> * @param array $context Context data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function render_callback_blogdescription( $partial, $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_callback_blogdescription( $partial, $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $context );
</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"> $x = get_bloginfo( 'description', 'display' );
</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"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_render_partials_request_with_single_valid_placement() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_render_partials_request_with_single_valid_placement() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->selective_refresh->add_partial(
</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"> * @return array|false 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">- function filter_customize_dynamic_partial_args( $partial_args, $partial_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_dynamic_partial_args( $partial_args, $partial_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'test_dynamic_blogname' === $partial_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $partial_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname' ),
</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"> * the placements' context data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function filter_customize_render_partials_response( $response, $component, $partial_placements ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_render_partials_response( $response, $component, $partial_placements ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Selective_Refresh', $component );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->expected_partial_ids ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Selective_Refresh $component Selective refresh component.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $partial_placements Partial 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">- function handle_action_customize_render_partials_after( $component, $partial_placements ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function handle_action_customize_render_partials_after( $component, $partial_placements ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Selective_Refresh', $component );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->expected_partial_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $this->expected_partial_ids, array_keys( $partial_placements ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Selective_Refresh $component Selective refresh component.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $partial_placements Partial 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">- function handle_action_customize_render_partials_before( $component, $partial_placements ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function handle_action_customize_render_partials_before( $component, $partial_placements ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Selective_Refresh', $component );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->expected_partial_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $this->expected_partial_ids, array_keys( $partial_placements ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +420,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_render_partials_request_for_dynamic_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_render_partials_request_for_dynamic_partial() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</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="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +458,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::handle_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_handle_render_partials_request_for_multiple_partials_placements() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handle_render_partials_request_for_multiple_partials_placements() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->selective_refresh->add_partial(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tear down.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expected_partial_ids = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizeselectiverefreshphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/selective-refresh.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/selective-refresh.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/selective-refresh.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Set up the test fixture.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = new WP_Customize_Manager();
</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"> * @see WP_Customize_Selective_Refresh::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->selective_refresh, $this->wp_customize->selective_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">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::register_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">- function test_register_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts = new WP_Scripts();
</span><span class="cx" style="display: block; padding: 0 10px"> $handles = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-selective-refresh',
</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"> * @see WP_Customize_Selective_Refresh::partials()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_partials() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_partials() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $this->selective_refresh->partials() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::add_partial()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::remove_partial()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_crud_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_crud_partial() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $partial = $this->selective_refresh->add_partial( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->selective_refresh, $partial->component );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Partial', $partial );
</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"> * @see WP_Customize_Selective_Refresh::init_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">- function test_init_preview() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_init_preview() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->selective_refresh->init_preview();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_action( 'template_redirect', array( $this->selective_refresh, 'handle_render_partials_request' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_action( 'wp_enqueue_scripts', array( $this->selective_refresh, 'enqueue_preview_scripts' ) ) );
</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"> * @see WP_Customize_Selective_Refresh::enqueue_preview_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">- function test_enqueue_preview_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_preview_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts = wp_scripts();
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::export_preview_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">- function test_export_preview_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_preview_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</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"> * @see WP_Customize_Selective_Refresh::add_dynamic_partials()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_dynamic_partials() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_dynamic_partials() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $partial_ids = array( 'recognized', 'recognized-class', 'unrecognized', 'already-added' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $partials = $this->selective_refresh->add_dynamic_partials( $partial_ids );
</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"> * @param string $partial_id ID for dynamic partial.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|array Dynamic partial 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">- function filter_customize_dynamic_partial_args( $partial_args, $partial_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_dynamic_partial_args( $partial_args, $partial_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false === $partial_args || is_array( $partial_args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $partial_id );
</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"> * @param array $partial_args The arguments to the WP_Customize_Partial constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_customize_dynamic_partial_class( $partial_class, $partial_id, $partial_args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_customize_dynamic_partial_class( $partial_class, $partial_id, $partial_args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $partial_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $partial_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $partial_class );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::is_render_partials_request()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_render_partials_request() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_render_partials_request() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->selective_refresh->is_render_partials_request() );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST[ WP_Customize_Selective_Refresh::RENDER_QUERY_VAR ] = '1';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->selective_refresh->is_render_partials_request() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tear down.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_scripts'] );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/setting.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/setting.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $undefined;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = new WP_Customize_Manager();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,13 +25,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->undefined = new stdClass();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_constructor_without_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_without_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting( $this->manager, 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager, $setting->manager );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $setting->id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,11 +84,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The setting value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Setting $setting The setting object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function sanitize_js_callback_base64_for_testing( $value, $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function sanitize_js_callback_base64_for_testing( $value, $setting ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return base64_encode( $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">- function test_constructor_with_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_with_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_posts',
</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"> * @see WP_Customize_Setting::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">- function test_preview_standard_types_non_multidimensional() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_standard_types_non_multidimensional() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['customized'] = wp_slash( wp_json_encode( $this->post_data_overrides ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Setting::preview()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Setting::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">- function test_preview_standard_types_multidimensional() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_standard_types_multidimensional() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['customized'] = wp_slash( wp_json_encode( $this->post_data_overrides ) );
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $custom_type_data_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">- function custom_type_getter( $name, $default = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function custom_type_getter( $name, $default = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( did_action( "customize_preview_{$name}" ) && array_key_exists( $name, $this->custom_type_data_previewed ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->custom_type_data_previewed[ $name ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( array_key_exists( $name, $this->custom_type_data_saved ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $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">- function custom_type_setter( $name, $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function custom_type_setter( $name, $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->custom_type_data_saved[ $name ] = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed|null
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function custom_type_value_filter( $default, $setting = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function custom_type_value_filter( $default, $setting = null ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function custom_type_preview( $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function custom_type_preview( $setting ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $previewed_value = $setting->post_value( $this->undefined );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->undefined !== $previewed_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->custom_type_data_previewed[ $setting->id ] = $previewed_value;
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_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">- function test_preview_custom_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preview_custom_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'custom_type';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data_overrides = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30988
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_non_posted_setting_applying_default_value_in_preview() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_non_posted_setting_applying_default_value_in_preview() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'option';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Setting::save()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Setting::update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_custom_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_custom_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'custom';
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type' ) );
</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"> * @param mixed $value
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function handle_customize_update_custom_foo_action( $value, $setting = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function handle_customize_update_custom_foo_action( $value, $setting = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'hello world \\o/', $value );
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Tests_WP_Customize_Setting::test_update_custom_type()
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function handle_customize_save_custom_foo_action( $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function handle_customize_save_custom_foo_action( $setting ) {
</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"> $this->assertSame( 'custom', $setting->type );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $setting->id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,7 +550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31428
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_current_blog_previewed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_current_blog_previewed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'option';
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'blogname';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,7 +572,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_previewing_with_switch_to_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_previewing_with_switch_to_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'option';
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'blogdescription';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33499
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_option_autoloading() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_option_autoloading() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/widgets.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/customize/widgets.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected $backup_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</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"> WP_Customize_Setting::reset_aggregated_multidimensionals();
</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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory, $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_sidebars = 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"> parent::clean_up_global_scope();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_scripts'] );
</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"> parent::tear_down();
</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">- function set_customized_post_data( $customized ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function set_customized_post_data( $customized ) {
</ins><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"> if ( $this->manager ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $customized as $id => $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">- function do_customize_boot_actions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function do_customize_boot_actions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_METHOD'] = 'POST';
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST['nonce'] = wp_create_nonce( 'preview-customize_' . $this->manager->theme()->get_stylesheet() );
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'setup_theme' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp', $GLOBALS['wp'] );
</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">- function remove_widgets_block_editor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function remove_widgets_block_editor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'widgets-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">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test WP_Customize_Widgets::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Widgets', $this->manager->widgets );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager, $this->manager->widgets->manager );
</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"> * @see WP_Customize_Widgets::preview_sidebars_widgets()
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36660
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_register_with_deleted_sidebars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_register_with_deleted_sidebars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 'sidebar-1';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::get_selective_refreshable_widgets()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_selective_refreshable_widgets_when_theme_supports() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_selective_refreshable_widgets_when_theme_supports() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory;
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'widgets_init', array( $this, 'override_search_widget_customize_selective_refresh' ), 90 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'customize-selective-refresh-widgets' );
</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"> * @see WP_Customize_Widgets::get_selective_refreshable_widgets()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_selective_refreshable_widgets_when_no_theme_supports() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_selective_refreshable_widgets_when_no_theme_supports() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'widgets_init', array( $this, 'override_search_widget_customize_selective_refresh' ), 90 );
</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"> $this->do_customize_boot_actions();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Tests_WP_Customize_Widgets::test_get_selective_refreshable_widgets_when_theme_supports()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Tests_WP_Customize_Widgets::test_get_selective_refreshable_widgets_when_no_theme_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">- function override_search_widget_customize_selective_refresh() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function override_search_widget_customize_selective_refresh() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_widget_factory->widgets['WP_Widget_Search']->widget_options['customize_selective_refresh'] = false;
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::is_widget_selective_refreshable()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_widget_selective_refreshable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_widget_selective_refreshable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'widgets_init', array( $this, 'override_search_widget_customize_selective_refresh' ), 90 );
</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->do_customize_boot_actions();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30988
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_settings() {
</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"> $raw_widget_customized = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_settings_without_selective_refresh() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_settings_without_selective_refresh() {
</ins><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"> $this->test_register_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_settings_with_late_theme_support_added() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_settings_with_late_theme_support_added() {
</ins><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"> add_action( 'after_setup_theme', array( $this, 'add_customize_selective_refresh_theme_support' ), 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->test_register_settings();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add customize-selective-refresh-widgets theme support.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function add_customize_selective_refresh_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_customize_selective_refresh_theme_support() {
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test WP_Customize_Widgets::get_setting_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">- function test_get_setting_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_setting_args() {
</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"> $this->do_customize_boot_actions();
</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"> $this->assertSame( 'SIDEBARS_WIDGETS[SIDEBAR-2]', $args['uppercase_id_set_by_filter'] );
</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">- function filter_widget_customizer_setting_args( $args, $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_widget_customizer_setting_args( $args, $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['uppercase_id_set_by_filter'] = strtoupper( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * Test WP_Customize_Widgets::sanitize_widget_js_instance() and WP_Customize_Widgets::sanitize_widget_instance()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_widget_js_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_widget_js_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $new_categories_instance = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53489
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_widget_instance_raw_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_widget_instance_raw_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'widgets_init', array( $this, 'remove_widgets_block_editor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53489
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_widget_instance_with_no_show_instance_in_rest() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_widget_instance_with_no_show_instance_in_rest() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'widgets_init', array( $this, 'remove_widgets_block_editor' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53479
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_widget_instance_empty_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_widget_instance_empty_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager->widgets->sanitize_widget_instance( array() ), array() );
</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"> * @return 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">- function get_test_widget_control_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_test_widget_control_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . '/wp-admin/includes/widgets.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_id = 'search-2';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,7 +575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::get_widget_control()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_widget_control() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_widget_control() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_control = $this->manager->widgets->get_widget_control( $this->get_test_widget_control_args() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,7 +588,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::get_widget_control_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">- function test_get_widget_control_parts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_widget_control_parts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_control_parts = $this->manager->widgets->get_widget_control_parts( $this->get_test_widget_control_args() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'content', $widget_control_parts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,7 +604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget_Form_Customize_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">- function test_wp_widget_form_customize_control_json() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_form_customize_control_json() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::is_panel_active()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_panel_active() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_panel_active() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,7 +643,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34738
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::call_widget_update()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_call_widget_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_call_widget_update() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_number = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_id = "search-{$widget_number}";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::customize_dynamic_partial_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">- function test_customize_dynamic_partial_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_dynamic_partial_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->manager );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'customize_dynamic_partial_args', false, 'widget[search-2]' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +725,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::selective_refresh_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">- function test_selective_refresh_init_with_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_selective_refresh_init_with_theme_support() {
</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"> $this->manager->widgets->selective_refresh_init();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_action( 'dynamic_sidebar_before', array( $this->manager->widgets, 'start_dynamic_sidebar' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,7 +739,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::selective_refresh_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">- function test_selective_refresh_init_without_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_selective_refresh_init_without_theme_support() {
</ins><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"> $this->manager->widgets->selective_refresh_init();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_action( 'dynamic_sidebar_before', array( $this->manager->widgets, 'start_dynamic_sidebar' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,7 +753,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::customize_preview_enqueue()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_preview_enqueue() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_enqueue() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->widgets->customize_preview_enqueue();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_script_is( 'customize-preview-widgets', 'enqueued' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_style_is( 'customize-preview', 'enqueued' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::start_dynamic_sidebar()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::end_dynamic_sidebar()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_dynamic_sidebar_params() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_dynamic_sidebar_params() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,7 +823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Widgets::render_widget_partial()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_widget_partial() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_widget_partial() {
</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"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->widgets->selective_refresh_init();
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/date/getFeedBuildDate.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Date_GetFeedBuildDate extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', 'UTC' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/date/getPermalink.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Date_GetPermalink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'permalink_structure' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', 'UTC' );
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/date/mysql2date.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Date_mysql2date extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><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( 'UTC' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28310
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql2date_returns_false_with_no_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql2date_returns_false_with_no_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( mysql2date( 'F j, Y H:i:s', '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28310
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql2date_returns_gmt_or_unix_timestamp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql2date_returns_gmt_or_unix_timestamp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 441013392, mysql2date( 'G', '1983-12-23 07:43:12' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 441013392, mysql2date( 'U', '1983-12-23 07:43:12' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql2date_should_format_time() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql2date_should_format_time() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone = 'Europe/Kiev';
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', $timezone );
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = new DateTime( 'now', new DateTimeZone( $timezone ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql2date_should_format_time_with_changed_time_zone() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql2date_should_format_time_with_changed_time_zone() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone = 'Europe/Kiev';
</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><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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql2date_should_return_wp_timestamp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql2date_should_return_wp_timestamp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone = 'Europe/Kiev';
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', $timezone );
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = new DateTime( 'now', new DateTimeZone( $timezone ) );
</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"> * @ticket 28992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql2date_should_return_unix_timestamp_for_gmt_time() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql2date_should_return_unix_timestamp_for_gmt_time() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone = 'Europe/Kiev';
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', $timezone );
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = new DateTime( 'now', new DateTimeZone( 'UTC' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/date/theDate.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 33750
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_date() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47354
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_weekday_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_weekday_date() {
</ins><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></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/date/xmlrpc.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wp_xmlrpc_server::wp_editComment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_date_edit_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date_edit_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone = 'Europe/Kiev';
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', $timezone );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdbcharsetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/db/charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/db/charset.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_strip_invalid_text() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_strip_invalid_text() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'latin1' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> // latin1. latin1 never changes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::strip_invalid_text
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_invalid_text( $data, $expected, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_invalid_text( $data, $expected, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $charset = self::$_wpdb->charset;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $data[0]['connection_charset'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_charset = $data[0]['connection_charset'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,7 +512,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::process_fields
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_process_fields_failure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_process_fields_failure() {
</ins><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"> $charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +528,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_process_field_charsets() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_process_field_charsets() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $GLOBALS['wpdb']->charset ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $charset = $GLOBALS['wpdb']->charset;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::process_field_charsets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_process_field_charsets( $data, $expected, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_process_field_charsets( $data, $expected, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = self::$_wpdb->process_field_charsets( $data, $GLOBALS['wpdb']->posts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,7 +611,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_process_field_charsets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_process_field_charsets_on_nonexistent_table() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_process_field_charsets_on_nonexistent_table() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '¡foo foo foo!',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::check_ascii
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_ascii() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_ascii() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ascii = "\0\t\n\r '" . '!"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( self::$_wpdb->check_ascii( $ascii ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +638,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::check_ascii
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_ascii_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_ascii_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( self::$_wpdb->check_ascii( 'ABCDEFGHIJKLMNOPQRSTUVWXYZ¡©«' ) );
</span><span class="cx" style="display: block; padding: 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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::strip_invalid_text_for_column
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_invalid_text_for_column() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_invalid_text_for_column() {
</ins><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"> $charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_test_get_table_charset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_test_get_table_charset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_name = 'test_get_table_charset';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,7 +757,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::get_table_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">- function test_get_table_charset( $drop, $create, $table, $expected_charset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_table_charset( $drop, $create, $table, $expected_charset ) {
</ins><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="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,7 +778,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_test_get_column_charset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_test_get_column_charset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_name = 'test_get_column_charset';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +798,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::get_col_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">- function test_get_column_charset( $drop, $create, $table, $expected_charset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_column_charset( $drop, $create, $table, $expected_charset ) {
</ins><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="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +821,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::get_col_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">- function test_get_column_charset_non_mysql( $drop, $create, $table, $columns ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_column_charset_non_mysql( $drop, $create, $table, $columns ) {
</ins><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="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,7 +848,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::get_col_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">- function test_get_column_charset_is_mysql_undefined( $drop, $create, $table, $columns ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_column_charset_is_mysql_undefined( $drop, $create, $table, $columns ) {
</ins><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="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -872,7 +872,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_strip_invalid_text_from_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_strip_invalid_text_from_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_name = 'strip_invalid_text_from_query_table';
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,7 +908,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::strip_invalid_text_from_query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_invalid_text_from_query( $create, $query, $expected, $drop ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_invalid_text_from_query( $create, $query, $expected, $drop ) {
</ins><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="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,7 +926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32104
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_dont_strip_text_from_schema_queries() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_dont_strip_text_from_schema_queries() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An obviously invalid and fake table name.
</span><span class="cx" style="display: block; padding: 0 10px"> $table_name = "\xff\xff\xff\xff";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -952,7 +952,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::strip_invalid_text_from_query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dont_strip_text_from_schema_queries( $query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dont_strip_text_from_schema_queries( $query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return = self::$_wpdb->strip_invalid_text_from_query( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $query, $return );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -962,7 +962,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_characters_in_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_characters_in_query() {
</ins><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"> $charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +976,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_table_collation_check() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_table_collation_check() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_name = 'table_collation_check';
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,7 +1034,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::check_safe_collation
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_table_collation_check( $create, $expected, $query, $drop, $always_true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_table_collation_check( $create, $expected, $query, $drop, $always_true ) {
</ins><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="cx" style="display: block; padding: 0 10px"> self::$_wpdb->query( $create );
</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"> * @covers wpdb::strip_invalid_text_for_column
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_invalid_text_for_column_bails_if_ascii_input_too_long() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_invalid_text_for_column_bails_if_ascii_input_too_long() {
</ins><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"> // TEXT column.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,7 +1070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::strip_invalid_text_from_query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_invalid_text_from_query_cp1251_is_safe() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_invalid_text_from_query_cp1251_is_safe() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tablename = 'test_cp1251_query_' . rand_str( 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->query( "CREATE TABLE $tablename ( a VARCHAR(50) ) DEFAULT CHARSET 'cp1251'" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "Test requires the 'cp1251' charset." );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1089,7 +1089,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::strip_invalid_text_from_query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_db_charset_defined() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_db_charset_defined() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tablename = 'test_cp1251_query_' . rand_str( 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->query( "CREATE TABLE $tablename ( a VARCHAR(50) ) DEFAULT CHARSET 'cp1251'" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "Test requires the 'cp1251' charset." );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1113,7 +1113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers wpdb::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">- function test_set_charset_changes_the_connection_collation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_charset_changes_the_connection_collation() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'utf8_general_ci', $results[0]->Value );
</span></span></pre></div>
<a id="trunktestsphpunittestsdbrealEscapephp"></a>
<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/realEscape.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/realEscape.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/db/realEscape.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $input The input to escape.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected The expected function 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">- function test_real_escape_input_type_handling( $input, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_real_escape_input_type_handling( $input, $expected ) {
</ins><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"> $this->assertSame( $expected, $wpdb->_real_escape( $input ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/db.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 10041
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_esc_like() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_like() {
</ins><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"> $inputs = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,12 +157,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $like string The like phrase, raw.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $result string The expected comparison result; '1' = true, '0' = false
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_like_query( $data, $like, $result ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_like_query( $data, $like, $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $result, $wpdb->get_var( $wpdb->prepare( 'SELECT %s LIKE %s', $data, $wpdb->esc_like( $like ) ) ) );
</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">- function data_like_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_like_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'aaa',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18510
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wpdb_supposedly_protected_properties() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wpdb_supposedly_protected_properties() {
</ins><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"> $this->assertNotEmpty( $wpdb->dbh );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wpdb_actually_protected_properties() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wpdb_actually_protected_properties() {
</ins><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"> $new_meta = "HAHA I HOPE THIS DOESN'T WORK";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18510
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wpdb_nonexistent_properties() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wpdb_nonexistent_properties() {
</ins><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"> $this->assertTrue( empty( $wpdb->nonexistent_property ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_sql_mode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_sql_mode() {
</ins><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"> $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
</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"> * @ticket 26847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_incompatible_sql_mode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_incompatible_sql_mode() {
</ins><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"> $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_allowed_incompatible_sql_mode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_allowed_incompatible_sql_mode() {
</ins><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"> $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
</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"> * @ticket 25604
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage wpdb::prepare
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_without_arguments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_without_arguments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> // This, obviously, is an incorrect prepare.
</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->assertSame( "SELECT * FROM $wpdb->users WHERE id = 0", $prepared );
</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">- function test_prepare_sprintf() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_sprintf() {
</ins><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><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"> * @expectedIncorrectUsage wpdb::prepare
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_sprintf_invalid_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_sprintf_invalid_args() {
</ins><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"> // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );
</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">- function test_prepare_vsprintf() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_vsprintf() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage wpdb::prepare
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_vsprintf_invalid_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_vsprintf_invalid_args() {
</ins><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"> // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,13 +471,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_db_version() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_db_version() {
</ins><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"> $this->assertTrue( version_compare( $wpdb->db_version(), '5.0', '>=' ) );
</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">- function test_get_caller() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_caller() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $called, end( $calls ) );
</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">- function test_has_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,17 +506,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated supports_collation
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_supports_collation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_supports_collation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wpdb->supports_collation() );
</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">- function test_check_database_version() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_database_version() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wpdb->check_database_version() );
</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">- function test_bail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bail() {
</ins><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"> $this->expectException( 'WPDieException' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->bail( 'Database is dead.' );
</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">- function test_timers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_timers() {
</ins><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"> $wpdb->timer_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +534,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( $stop, $wpdb->time_start );
</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">- function test_get_col_info() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_col_info() {
</ins><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"> $wpdb->get_results( "SELECT ID FROM $wpdb->users" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $wpdb->users, $wpdb->get_col_info( 'table', 0 ) );
</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">- function test_query_and_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_and_delete() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $rows );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $d_rows );
</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">- function test_get_row() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_row() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $rows );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45299
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_col( $query, $expected, $last_result, $column ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_col( $query, $expected, $last_result, $column ) {
</ins><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"> $wpdb->last_result = $last_result;
</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"> * @type arrray|string|null $last_result The value to assign to `$wpdb->last_result`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int|string $column The column index to retrieve.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_test_get_col() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_test_get_col() {
</ins><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"> return array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,7 +655,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">- function test_replace() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replace() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $rows1 );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26106
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_where_on_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_where_on_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'post_name' => 'burrito' ), array() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28155
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysqli_flush_sync() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysqli_flush_sync() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wpdb->use_mysqli ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'mysqli not being used.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,7 +741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32763
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_get_table_from_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_get_table_from_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $table = 'a_test_table_name';
</span><span class="cx" style="display: block; padding: 0 10px"> $more_tables = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // table_name => expected_value
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -865,11 +865,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_table_from_query
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_table_from_query( $query, $table ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_table_from_query( $query, $table ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $table, self::$_wpdb->get_table_from_query( $query ) );
</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">- function data_get_table_from_query_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_get_table_from_query_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $table = 'a_test_table_name';
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( "LOL THIS ISN'T EVEN A QUERY $table" ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +880,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_table_from_query_false
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_table_from_query_false( $query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_table_from_query_false( $query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( self::$_wpdb->get_table_from_query( $query ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,7 +887,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38751
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_get_escaped_table_from_show_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_get_escaped_table_from_show_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Equality.
</span><span class="cx" style="display: block; padding: 0 10px"> array( "SHOW TABLE STATUS WHERE Name = 'test_name'", 'test_name' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,7 +907,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_escaped_table_from_show_query
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38751
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_escaped_table_from_show_query( $query, $table ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_escaped_table_from_show_query( $query, $table ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $table, self::$_wpdb->get_table_from_query( $query ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -914,7 +914,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_process_field_formats() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_process_field_formats() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $core_db_fields_no_format_specified = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,7 +1022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_process_field_formats
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_process_field_formats( $data, $format, $expected, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_process_field_formats( $data, $format, $expected, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = self::$_wpdb->process_field_formats( $data, $format );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,7 +1030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_process_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_process_fields() {
</ins><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"> if ( $wpdb->charset ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1060,7 +1060,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_process_fields
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_process_fields_on_nonexistent_table( $data ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_process_fields_on_nonexistent_table( $data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$_wpdb->suppress_errors( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array( 'post_content' => '¡foo foo foo!' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( self::$_wpdb->process_fields( 'nonexistent_table', $data, null ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,7 +1070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_get_table_charset_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_get_table_charset_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_table_charset', array( $this, 'filter_pre_get_table_charset' ), 10, 2 );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1077,7 +1077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $charset, 'fake_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">- function filter_pre_get_table_charset( $charset, $table ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_get_table_charset( $charset, $table ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'fake_charset';
</span><span class="cx" style="display: block; padding: 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_get_col_charset_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_get_col_charset_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_col_charset', array( $this, 'filter_pre_get_col_charset' ), 10, 3 );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1091,7 +1091,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $charset, 'fake_col_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">- function filter_pre_get_col_charset( $charset, $table, $column ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_get_col_charset( $charset, $table, $column ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'fake_col_charset';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,7 +1098,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_null_insert() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_null_insert() {
</ins><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"> $key = 'null_insert_key';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_null_update_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_null_update_value() {
</ins><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"> $key = 'null_update_value_key';
</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"> * @ticket 15158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_null_update_where() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_null_update_where() {
</ins><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"> $key = 'null_update_where_key';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,7 +1196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_null_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_null_delete() {
</ins><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"> $key = 'null_update_where_key';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1232,7 +1232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34903
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_close() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_close() {
</ins><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"> $this->assertTrue( $wpdb->close() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1251,7 +1251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36917
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_charset_not_determined_when_disconnected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_charset_not_determined_when_disconnected() {
</ins><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"> $charset = 'utf8';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1269,7 +1269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36917
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_charset_switched_to_utf8mb4() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_charset_switched_to_utf8mb4() {
</ins><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"> if ( ! $wpdb->has_cap( 'utf8mb4' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1288,7 +1288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32105
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36917
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_collate_switched_to_utf8mb4_520() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_collate_switched_to_utf8mb4_520() {
</ins><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"> if ( ! $wpdb->has_cap( 'utf8mb4_520' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1307,7 +1307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32405
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36917
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_non_unicode_collations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_non_unicode_collations() {
</ins><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"> if ( ! $wpdb->has_cap( 'utf8mb4' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1325,7 +1325,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37982
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_charset_switched_to_utf8() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_charset_switched_to_utf8() {
</ins><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"> if ( $wpdb->has_cap( 'utf8mb4' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1344,7 +1344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_prepare_with_placeholders
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_with_placeholders_and_individual_args( $sql, $values, $incorrect_usage, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_with_placeholders_and_individual_args( $sql, $values, $incorrect_usage, $expected ) {
</ins><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"> if ( $incorrect_usage ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,7 +1363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_prepare_with_placeholders
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_with_placeholders_and_array_args( $sql, $values, $incorrect_usage, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_with_placeholders_and_array_args( $sql, $values, $incorrect_usage, $expected ) {
</ins><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"> if ( $incorrect_usage ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1379,7 +1379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $sql );
</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">- function data_prepare_with_placeholders() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_prepare_with_placeholders() {
</ins><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"> return array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1557,7 +1557,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_escape_and_prepare
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_escape_and_prepare( $escape, $sql, $values, $incorrect_usage, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escape_and_prepare( $escape, $sql, $values, $incorrect_usage, $expected ) {
</ins><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"> if ( $incorrect_usage ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1574,7 +1574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function data_escape_and_prepare() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_escape_and_prepare() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1604,7 +1604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage wpdb::prepare
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_double_prepare() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_double_prepare() {
</ins><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"> $part = $wpdb->prepare( ' AND meta_value = %s', ' %s ' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1614,7 +1614,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $query );
</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">- function test_prepare_numeric_placeholders_float_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_numeric_placeholders_float_args() {
</ins><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"> $actual = $wpdb->prepare(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1629,7 +1629,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( ' second=2.2', $actual );
</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">- function test_prepare_numeric_placeholders_float_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_numeric_placeholders_float_array() {
</ins><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"> $actual = $wpdb->prepare(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,7 +1643,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( ' second=2.2', $actual );
</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">- function test_query_unescapes_placeholders() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_unescapes_placeholders() {
</ins><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"> $value = ' %s ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,7 +1662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $value, $actual );
</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">- function test_esc_sql_with_unsupported_placeholder_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_sql_with_unsupported_placeholder_type() {
</ins><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"> $sql = $wpdb->prepare( ' %s %1$c ', 'foo' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dbdelta.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31869
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_truncated_index() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_truncated_index() {
</ins><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"> if ( ! $wpdb->has_cap( 'utf8mb4' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36748
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dont_downsize_text_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dont_downsize_text_fields() {
</ins><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"> $result = dbDelta(
</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"> * @ticket 36748
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dont_downsize_blob_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dont_downsize_blob_fields() {
</ins><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"> $result = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36748
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_upsize_text_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upsize_text_fields() {
</ins><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"> $result = dbDelta(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36748
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_upsize_blob_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upsize_blob_fields() {
</ins><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"> $result = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,7 +557,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_with_backticks_does_not_throw_an_undefined_index_warning() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_with_backticks_does_not_throw_an_undefined_index_warning() {
</ins><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"> $schema = "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +582,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36948
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spatial_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spatial_indices() {
</ins><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"> $db_version = $wpdb->db_version();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,7 +643,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_with_backticks_does_not_cause_a_query_to_alter_all_columns_and_indices_to_run_even_if_none_have_changed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_with_backticks_does_not_cause_a_query_to_alter_all_columns_and_indices_to_run_even_if_none_have_changed() {
</ins><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"> $schema = "
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_index_with_a_reserved_keyword_can_be_created() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_index_with_a_reserved_keyword_can_be_created() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_db_schema_does_no_alter_queries_on_existing_install() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_db_schema_does_no_alter_queries_on_existing_install() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta( wp_get_db_schema() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $updates );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_key_and_index_and_fulltext_key_and_fulltext_index_and_unique_key_and_unique_index_indicies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_key_and_index_and_fulltext_key_and_fulltext_index_and_unique_key_and_unique_index_indicies() {
</ins><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"> $schema = "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,7 +755,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_index_and_key_are_synonyms_and_do_not_recreate_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_index_and_key_are_synonyms_and_do_not_recreate_indices() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,7 +779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_indices_with_prefix_limits_are_created_and_do_not_recreate_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_indices_with_prefix_limits_are_created_and_do_not_recreate_indices() {
</ins><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"> $schema = "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,7 +813,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34959
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_index_col_names_with_order_do_not_recreate_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_index_col_names_with_order_do_not_recreate_indices() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -837,7 +837,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34873
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_primary_key_with_single_space_does_not_recreate_index() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_primary_key_with_single_space_does_not_recreate_index() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -861,7 +861,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34869
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_index_definitions_with_spaces_do_not_recreate_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_index_definitions_with_spaces_do_not_recreate_indices() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -885,7 +885,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_index_types_are_not_case_sensitive_and_do_not_recreate_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_index_types_are_not_case_sensitive_and_do_not_recreate_indices() {
</ins><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"> $updates = dbDelta(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34874
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_key_names_are_not_case_sensitive_and_do_not_recreate_indices() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_key_names_are_not_case_sensitive_and_do_not_recreate_indices() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -934,7 +934,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34870
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unchanged_key_lengths_do_not_recreate_index() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unchanged_key_lengths_do_not_recreate_index() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -959,7 +959,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34870
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_changed_key_lengths_do_not_recreate_index() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_changed_key_lengths_do_not_recreate_index() {
</ins><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"> $updates = dbDelta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,7 +1043,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31679
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_column_type_change_with_hyphens_in_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_column_type_change_with_hyphens_in_name() {
</ins><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"> $schema = "
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dependencies/jquery.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Scripts::query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_location_of_jquery() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_location_of_jquery() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts = new WP_Scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_scripts( $scripts );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_script_is
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dont_allow_deregister_core_scripts_in_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dont_allow_deregister_core_scripts_in_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'edit.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_admin() );
</span><span class="cx" style="display: block; padding: 0 10px"> $libraries = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_script_is
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_script_is_dep_enqueued() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_script_is_dep_enqueued() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'jquery-ui-accordion' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_script_is( 'jquery', 'enqueued' ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Scripts::do_items
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_jquery_in_footer() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_jquery_in_footer() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts = new WP_Scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-core', '/jquery.js', array() );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected $wp_scripts_print_translations_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_default_scripts', 'wp_default_scripts' );
</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"> $this->wp_scripts_print_translations_output .= "\n";
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_scripts'] = $this->old_wp_scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_default_scripts', 'wp_default_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11315
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_enqueue_script() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_enqueue_script() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'no-deps-no-version', 'example.com', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'empty-deps-no-version', 'example.com' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'empty-deps-version', 'example.com', array(), 1.2 );
</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"> * @ticket 42804
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_enqueue_script_with_html5_support_does_not_contain_type_attribute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_enqueue_script_with_html5_support_does_not_contain_type_attribute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_scripts'] = new WP_Scripts();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16024
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_script_add_data_with_data_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_script_add_data_with_data_key() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Enqueue and add data.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-only-data', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_script_add_data( 'test-only-data', 'data', 'testing' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16024
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_script_add_data_with_conditional_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_script_add_data_with_conditional_key() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Enqueue and add conditional comments.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-only-conditional', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_script_add_data( 'test-only-conditional', 'conditional', 'gt IE 7' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16024
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_script_add_data_with_data_and_conditional_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_script_add_data_with_data_and_conditional_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Enqueue and add data plus conditional comments for both.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-conditional-with-data', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_script_add_data( 'test-conditional-with-data', 'data', 'testing' );
</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"> * @ticket 16024
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_script_add_data_with_invalid_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_script_add_data_with_invalid_key() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Enqueue and add an invalid key.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-invalid', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_script_add_data( 'test-invalid', 'invalid', 'testing' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31126
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_script() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_register_script() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_register_script( 'duplicate-handler', 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_register_script( 'duplicate-handler', 'http://example.com' ) );
</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"> * @ticket 35229
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_script_with_handle_without_source() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_register_script_with_handle_without_source() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='http://example.com?ver=1' id='handle-one-js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='http://example.com?ver=2' id='handle-two-js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35643
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_enqueue_script_footer_alias() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_enqueue_script_footer_alias() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'foo', false, array( 'bar', 'baz' ), '1.0', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'bar', home_url( 'bar.js' ), array(), '1.0', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'baz', home_url( 'baz.js' ), array(), '1.0', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35873
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_script_with_dependencies_in_head_and_footer() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_register_script_with_dependencies_in_head_and_footer() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'parent', '/parent.js', array( 'child-head' ), null, true ); // In footer.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'child-head', '/child-head.js', array( 'child-footer' ), null, false ); // In head.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'child-footer', '/child-footer.js', array(), null, true ); // In footer.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35956
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'child-head', '/child-head.js', array(), null, false ); // In head.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'child-footer', '/child-footer.js', array(), null, true ); // In footer.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'parent', '/parent.js', array( 'child-head', 'child-footer' ), null, true ); // In footer.
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35956
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order_and_two_parent_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order_and_two_parent_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'grandchild-head', '/grandchild-head.js', array(), null, false ); // In head.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'child-head', '/child-head.js', array(), null, false ); // In head.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'child-footer', '/child-footer.js', array( 'grandchild-head' ), null, true ); // In footer.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,7 +392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_returns_bool() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_returns_bool() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_add_inline_script( 'test-example', 'console.log("before");', 'before' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_add_inline_script( 'test-example', 'console.log("before");', 'before' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_unknown_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_unknown_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_add_inline_script( 'test-invalid', 'console.log("before");', 'before' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_echo( 'wp_print_scripts' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_before() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_before() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_after() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_after() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', 'example.com', array(), null );
</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">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_before_and_after() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_before_and_after() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("after");' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44551
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_before_for_handle_without_source() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_before_for_handle_without_source() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'test-example', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44551
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_after_for_handle_without_source() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_after_for_handle_without_source() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'test-example', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("after");' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44551
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_before_and_after_for_handle_without_source() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_before_and_after_for_handle_without_source() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'test-example', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_multiple() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_multiple() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,7 +508,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14853
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_script_localized_data_is_added_first() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_script_localized_data_is_added_first() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', 'example.com', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'test-example', 'testExample', array( 'foo' => 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dependencies/styles.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> private $old_wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> private $old_wp_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $GLOBALS['wp_styles'] ) ) {
</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"> $GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_styles'] = $this->old_wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_scripts'] = $this->old_wp_scripts;
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11315
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_enqueue_style() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_enqueue_style() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'no-deps-no-version', 'example.com' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'no-deps-version', 'example.com', array(), 1.2 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'no-deps-null-version', 'example.com', array(), null );
</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"> * @ticket 42804
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_enqueue_style_with_html5_support_does_not_contain_type_attribute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_enqueue_style_with_html5_support_does_not_contain_type_attribute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'style' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_styles'] = new WP_Styles();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31126
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_style() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_register_style() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_register_style( 'duplicate-handler', 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_register_style( 'duplicate-handler', 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35229
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_inline_style_for_handle_without_source() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_inline_style_for_handle_without_source() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $style = 'a { color: blue; }';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='stylesheet' id='handle-one-css' href='http://example.com?ver=1' type='text/css' media='all' />\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,12 +316,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35921
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_styles_with_media
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_enqueue_style_with_media( $expected, $media ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_enqueue_style_with_media( $expected, $media ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'handle', 'http://example.com', array(), 1, $media );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( $expected, get_echo( 'wp_print_styles' ) );
</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">- function data_styles_with_media() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_styles_with_media() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "media='all'",
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_enqueue_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">- function test_block_styles_for_editing_without_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_styles_for_editing_without_theme_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Confirm we are without theme support by default.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'wp-block-styles' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_common_block_scripts_and_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">- function test_block_styles_for_editing_with_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_styles_for_editing_with_theme_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'wp-block-styles' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_styles( $GLOBALS['wp_styles'] );
</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"> * @covers ::wp_enqueue_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">- function test_no_block_styles_for_viewing_without_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_block_styles_for_viewing_without_theme_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Confirm we are without theme support by default.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'wp-block-styles' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_common_block_scripts_and_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">- function test_block_styles_for_viewing_with_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_styles_for_viewing_with_theme_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'wp-block-styles' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_styles( $GLOBALS['wp_styles'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_default_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">- function test_block_styles_for_viewing_without_split_styles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_styles_for_viewing_without_split_styles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'should_load_separate_core_block_assets', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_styles( $GLOBALS['wp_styles'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_default_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">- function test_block_styles_for_viewing_with_split_styles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_styles_for_viewing_with_split_styles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'should_load_separate_core_block_assets', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_styles( $GLOBALS['wp_styles'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdependencieswpSanitizeScriptAttributesphp"></a>
<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/wpSanitizeScriptAttributes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions_wpSanitizeScriptAttributes extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_script_attributes_type_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_script_attributes_type_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_script_attributes_type_not_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_script_attributes_type_not_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_script_attributes_no_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_script_attributes_no_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> remove_theme_support( 'html5' );
</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">- function test_sanitize_script_attributes_relative_src() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_script_attributes_relative_src() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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">- function test_sanitize_script_attributes_only_false_boolean_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_script_attributes_only_false_boolean_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> remove_theme_support( 'html5' );
</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">- function test_sanitize_script_attributes_only_true_boolean_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_script_attributes_only_true_boolean_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span></span></pre></div>
<a id="trunktestsphpunittestsdependencieswpScriptTagphp"></a>
<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/wpScriptTag.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/wpScriptTag.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dependencies/wpScriptTag.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions_wpScriptTag extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_script_tag_type_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_script_tag_type_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> * @covers ::wp_get_script_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">- function test_get_script_tag_type_not_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_script_tag_type_not_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'html5', array( 'script' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> * @covers ::wp_print_script_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">- function test_print_script_tag_prints_get_script_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_print_script_tag_prints_get_script_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_script_attributes',
</span><span class="cx" style="display: block; padding: 0 10px"> static function ( $attributes ) {
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/dependencies.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group scripts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Dependencies extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</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"> $this->assertFalse( $dep->add( 'one', '' ) );
</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">- function test_remove() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_enqueue() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</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"> $this->assertTrue( $dep->query( 'two', 'queue' ) );
</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">- function test_dequeue() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dequeue() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</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"> $this->assertFalse( $dep->query( 'two', 'queue' ) );
</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">- function test_enqueue_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</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"> $this->assertSame( 'arg', $dep->args['two'] );
</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">- function test_dequeue_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dequeue_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21741
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_and_registered_enqueued() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_and_registered_enqueued() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dep = new WP_Dependencies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $dep->add( 'one', '' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsexternalhttpbasicphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/external-http/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/external-http/basic.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/external-http/basic.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @covers ::wp_remote_retrieve_response_code
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_readme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_readme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This test is designed to only run on trunk/master.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipOnAutomatedBranches();
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/feed/atom.php 2021-11-04 15:22:47 UTC (rev 52010)
</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 is a bit of a hack used to buffer feed 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">- function do_atom() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function do_atom() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> // Nasty hack! In the future it would better to leverage do_feed( 'atom' ).
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</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"> * Test the <feed> element to make sure its present and populated
</span><span class="cx" style="display: block; padding: 0 10px"> * with the expected child elements and 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">- function test_feed_element() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_feed_element() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = $this->do_atom();
</span><span class="cx" style="display: block; padding: 0 10px"> $xml = xml_to_array( $feed );
</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><span class="cx" style="display: block; padding: 0 10px"> * Validate <entry> child elements.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_entry_elements() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_entry_elements() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = $this->do_atom();
</span><span class="cx" style="display: block; padding: 0 10px"> $xml = xml_to_array( $feed );
</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"> * @ticket 33591
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_atom_enclosure_with_extended_url_length_type_parsing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_atom_enclosure_with_extended_url_length_type_parsing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $enclosures = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> // URL, length, type.
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2021-11-04 15:22:47 UTC (rev 52010)
</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 is a bit of a hack used to buffer feed 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">- function do_rss2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function do_rss2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> // Nasty hack! In the future it would better to leverage do_feed( 'rss2' ).
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</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"> * Test the <rss> element to make sure its present and populated
</span><span class="cx" style="display: block; padding: 0 10px"> * with the expected child elements and 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">- function test_rss_element() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rss_element() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=rss2' );
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = $this->do_rss2();
</span><span class="cx" style="display: block; padding: 0 10px"> $xml = xml_to_array( $feed );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return [type] [description]
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_channel_element() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_channel_element() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=rss2' );
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = $this->do_rss2();
</span><span class="cx" style="display: block; padding: 0 10px"> $xml = xml_to_array( $feed );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39141
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_channel_pubdate_element_translated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_channel_pubdate_element_translated() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_locale = $GLOBALS['wp_locale'];
</span><span class="cx" style="display: block; padding: 0 10px"> /* @var WP_Locale $locale */
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = clone $GLOBALS['wp_locale'];
</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"> $this->assertStringNotContainsString( 'Tue_Translated', $pubdate[0]['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">- function test_item_elements() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_item_elements() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=rss2' );
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = $this->do_rss2();
</span><span class="cx" style="display: block; padding: 0 10px"> $xml = xml_to_array( $feed );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9134
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_items_comments_closed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_items_comments_closed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comments_open', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=rss2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30210
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_home_feed_endpoint() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_home_feed_endpoint() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An example of a valid home feed endpoint.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( 'feed/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30210
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_taxonomy_feed_endpoint() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_taxonomy_feed_endpoint() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An example of an valid taxonomy feed endpoint.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( 'category/foo/feed/' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30210
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_main_comment_feed_endpoint() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_main_comment_feed_endpoint() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Generate a bunch of comments.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( self::$posts as $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->comment->create_post_comments( $post, 3 );
</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"> * @ticket 30210
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_archive_feed_endpoint() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_archive_feed_endpoint() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An example of an valid date archive feed endpoint.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '2003/05/27/feed/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30210
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_single_post_comment_feed_endpoint() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_single_post_comment_feed_endpoint() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An example of an valid date archive feed endpoint.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_comments_feed_link( self::$posts[0] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30210
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_search_feed_endpoint() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_search_feed_endpoint() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // An example of an valid search feed endpoint.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?s=Lorem&feed=rss' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/file.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_File extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->dir = untrailingslashit( get_temp_dir() );
</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"> * @group plugins
</span><span class="cx" style="display: block; padding: 0 10px"> * @group themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_file_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_file_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_headers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Name' => 'Theme Name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ThemeURI' => 'Theme URI',
</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"> * @group plugins
</span><span class="cx" style="display: block; padding: 0 10px"> * @group themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_file_data_with_cr_line_endings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_file_data_with_cr_line_endings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'SomeHeader' => 'Some Header',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Description' => 'Description',
</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"> * @group plugins
</span><span class="cx" style="display: block; padding: 0 10px"> * @group themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_file_data_with_php_open_tag_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_file_data_with_php_open_tag_prefix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'TemplateName' => 'Template Name',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">- function is_unique_writable_file( $path, $filename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function is_unique_writable_file( $path, $filename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fullpath = $path . DIRECTORY_SEPARATOR . $filename;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fp = fopen( $fullpath, 'x' );
</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"> return $result;
</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">- function test_unique_filename_is_valid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_is_valid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure it produces a valid, writable, unique filename.
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_unique_filename( $this->dir, __FUNCTION__ . '.txt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> unlink( $this->dir . DIRECTORY_SEPARATOR . $filename );
</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">- function test_unique_filename_is_unique() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_is_unique() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure it produces two unique filenames.
</span><span class="cx" style="display: block; padding: 0 10px"> $name = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $this->dir . DIRECTORY_SEPARATOR . $filename2 );
</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">- function test_unique_filename_is_sanitized() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_is_sanitized() {
</ins><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 . $this->badchars . '.txt' );
</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"> unlink( $this->dir . DIRECTORY_SEPARATOR . $filename );
</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">- function test_unique_filename_with_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_with_slashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> // "foo/foo.txt"
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_unique_filename( $this->dir, $name . '/' . $name . '.txt' );
</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"> unlink( $this->dir . DIRECTORY_SEPARATOR . $filename );
</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">- function test_unique_filename_multiple_ext() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_multiple_ext() {
</ins><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 . '.php.txt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> unlink( $this->dir . DIRECTORY_SEPARATOR . $filename );
</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">- function test_unique_filename_no_ext() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_no_ext() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,13 +186,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_tempnam_filenames
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_tempnam( $case ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_tempnam( $case ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_tempnam( $case );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( basename( basename( $file, '.tmp' ), '.zip' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_wp_tempnam_filenames() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_tempnam_filenames() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '0.zip' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '0.1.2.3.zip' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47186
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_file_signature_functions_as_expected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_file_signature_functions_as_expected() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_tempnam();
</span><span class="cx" style="display: block; padding: 0 10px"> file_put_contents( $file, 'WordPress' );
</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"> * @ticket 47186
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_file_signature_expected_failure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_file_signature_expected_failure() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_tempnam();
</span><span class="cx" style="display: block; padding: 0 10px"> file_put_contents( $file, 'WordPress' );
</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"> $this->assertSame( 'signature_verification_failed', $verify->get_error_code() );
</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">- function filter_trust_plus85Tq_key( $keys ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_trust_plus85Tq_key( $keys ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // A static once-off key used to verify verify_file_signature() works as expected.
</span><span class="cx" style="display: block; padding: 0 10px"> $keys[] = '+85TqMhxQVAYVW4BSCVkJQvZH4q7z8I9lePbvngvf7A=';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsfilesystembasephp"></a>
<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/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filesystem/base.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/filesystem/base.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This class is designed to make use of MockFS, a Virtual in-memory filesystem compatible with WP_Filesystem
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> abstract class WP_Filesystem_UnitTestCase extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'filesystem_method_file', array( $this, 'filter_abstraction_file' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'filesystem_method', array( $this, 'filter_fs_method' ) );
</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"> WP_Filesystem();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'filesystem_method_file', array( $this, 'filter_abstraction_file' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'filesystem_method', array( $this, 'filter_fs_method' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,14 +20,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function filter_fs_method( $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_fs_method( $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'MockFS';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_abstraction_file( $file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_abstraction_file( $file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return dirname( dirname( __DIR__ ) ) . '/includes/mock-fs.php';
</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">- function test_is_MockFS_sane() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_MockFS_sane() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Filesystem_MockFS', $wp_filesystem );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/filesystem/findFolder.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Filesystem_Find_Folder_Test extends WP_Filesystem_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ftp_has_root_access() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ftp_has_root_access() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs = $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs->init(
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sibling_wordpress_in_subdir() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sibling_wordpress_in_subdir() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs = $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs->init(
</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"> * example.com at /
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.example.com at /wp.example.com/wordpress/
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_subdir_of_another() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_subdir_of_another() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs = $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs->init(
</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"> * @ticket 20934
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_tokens_in_path1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_tokens_in_path1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs = $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> $fs->init(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/filters.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Filters extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_simple_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_simple_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</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"> $this->assertSame( array( $val ), $args );
</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">- function test_remove_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</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">
</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">- function test_has_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $func = __FUNCTION__ . '_func';
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // One tag with multiple filters.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_filters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_filters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</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"> $this->assertSame( 1, $a2->get_call_count() );
</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">- function test_filter_args_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_args_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</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"> $this->assertSame( array( $val, $arg1 ), array_pop( $argsvar ) );
</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">- function test_filter_args_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_args_2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $val ), array_pop( $argsvar2 ) );
</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">- function test_filter_priority() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_priority() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</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"> $this->assertSame( $expected, $a->get_events() );
</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">- function test_all_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_all_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $tag2 = __FUNCTION__ . '_2';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remove_all_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_all_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20920
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remove_all_filters_should_respect_the_priority_argument() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_all_filters_should_respect_the_priority_argument() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9886
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_ref_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_ref_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $obj = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12723
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_ref_array_result() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_ref_array_result() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $obj = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $b = new MockAction();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,15 +264,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">- function _self_removal( $tag ) {
- remove_action( $tag, array( $this, '_self_removal' ), 10, 1 );
- return $tag;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29070
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_filter_after_remove_all_filters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_filter_after_remove_all_filters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $val = __FUNCTION__ . '_val';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,14 +348,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39007
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_current_priority() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'test_current_priority', array( $this, '_current_priority_action' ), 99 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'test_current_priority', array( $this, 'current_priority_action' ), 99 );
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'test_current_priority' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'test_current_priority', array( $this, '_current_priority_action' ), 99 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'test_current_priority', array( $this, 'current_priority_action' ), 99 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 99, $this->current_priority );
</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">- public function _current_priority_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function current_priority_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_priority = $wp_filter[ current_filter() ]->current_priority();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,14 +364,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39007
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_other_priority() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'test_current_priority', array( $this, '_other_priority_action' ), 99 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'test_current_priority', array( $this, 'other_priority_action' ), 99 );
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'test_current_priority' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'test_current_priority', array( $this, '_other_priority_action' ), 99 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'test_current_priority', array( $this, 'other_priority_action' ), 99 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->current_priority );
</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">- public function _other_priority_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function other_priority_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_priority = $wp_filter['the_content']->current_priority();
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/balanceTags.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_BalanceTags extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function nestable_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function nestable_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'blockquote' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'div' ),
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a complete(?) listing of valid single/self-closing tags.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function single_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function single_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'area' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'base' ),
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function supported_traditional_tag_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function supported_traditional_tag_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'a' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'div' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function supported_custom_element_tag_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function supported_custom_element_tag_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'custom-element' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'my-custom-element' ),
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function invalid_tag_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function invalid_tag_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '<0-day>inside', '<0-day>inside' ), // Can't start with a number - handled by the "<3" fix.
</span><span class="cx" style="display: block; padding: 0 10px"> array( '<UPPERCASE-TAG>inside', '<UPPERCASE-TAG>inside' ), // Custom elements cannot be uppercase.
</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"> * @see https://w3c.github.io/webcomponents/spec/custom/#valid-custom-element-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">- function unsupported_valid_tag_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function unsupported_valid_tag_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // We don't allow ending in a dash.
</span><span class="cx" style="display: block; padding: 0 10px"> array( '<what->inside' ),
</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"> * @see https://w3c.github.io/webcomponents/spec/custom/#valid-custom-element-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">- function supported_invalid_tag_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function supported_invalid_tag_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Reserved names for custom elements.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'annotation-xml' ),
</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"> * @ticket 47014
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider supported_traditional_tag_names
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_detects_traditional_tag_names( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_detects_traditional_tag_names( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $normalized = strtolower( $tag );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "<$normalized>inside</$normalized>", balanceTags( "<$tag>inside", true ) );
</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"> * @ticket 47014
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_detects_supported_custom_element_tag_names( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_detects_supported_custom_element_tag_names( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", 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">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47014
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ignores_invalid_tag_names( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignores_invalid_tag_names( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $output, balanceTags( $input, 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">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47014
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ignores_unsupported_custom_tag_names( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignores_unsupported_custom_tag_names( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "<$tag>inside", balanceTags( "<$tag>inside", 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">@@ -185,7 +185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47014
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_detects_supported_invalid_tag_names( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_detects_supported_invalid_tag_names( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", 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">@@ -195,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 1597
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider single_tags
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_selfcloses_unclosed_known_single_tags( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_selfcloses_unclosed_known_single_tags( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "<$tag />", balanceTags( "<$tag>", 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">@@ -206,7 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 1597
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider single_tags
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_selfcloses_known_single_tags_having_closing_tag( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_selfcloses_known_single_tags_having_closing_tag( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "<$tag />", balanceTags( "<$tag></$tag>", 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">@@ -213,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 1597
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_closes_unknown_single_tags_with_closing_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_closes_unknown_single_tags_with_closing_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong/>',
</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"> }
</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">- function test_closes_unclosed_single_tags_having_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_closes_unclosed_single_tags_having_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<img src="/images/example.png">',
</span><span class="cx" style="display: block; padding: 0 10px"> '<input type="text" name="example">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_allows_validly_closed_single_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allows_validly_closed_single_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<br />',
</span><span class="cx" style="display: block; padding: 0 10px"> '<hr />',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,7 +267,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider nestable_tags
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_balances_nestable_tags( $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_balances_nestable_tags( $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "<$tag>Test<$tag>Test</$tag>",
</span><span class="cx" style="display: block; padding: 0 10px"> "<$tag><$tag>Test",
</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"> }
</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">- function test_allows_adjacent_nestable_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allows_adjacent_nestable_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<blockquote><blockquote>Example quote</blockquote></blockquote>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="container"><div>This is allowed></div></div>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,12 +301,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20401
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_allows_immediately_nested_object_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allows_immediately_nested_object_tags() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $object, balanceTags( $object, 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">- function test_balances_nested_non_nestable_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_balances_nested_non_nestable_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<b><b>This is bold</b></b>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<b>Some text here <b>This is bold</b></b>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fixes_improper_closing_tag_sequence() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fixes_improper_closing_tag_sequence() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>Here is a <strong class="part">bold <em>and emphasis</p></em></strong>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<ul><li>Aaa</li><li>Bbb</ul></li>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,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">- function test_adds_missing_closing_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_adds_missing_closing_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<b><i>Test</b>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>Test',
</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"> }
</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">- function test_removes_extraneous_closing_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_extraneous_closing_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<b>Test</b></b>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<div>Test</div></div><div>Test',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/capitalPDangit.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_CapitalPDangit extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_esc_attr_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_attr_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_filter;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Something about WordPress', capital_P_dangit( 'Something about Wordpress' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Something about (WordPress', capital_P_dangit( 'Something about (Wordpress' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/cleanPre.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_CleanPre extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_self_closing_br_with_space() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_self_closing_br_with_space() {
</ins><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><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"> $this->assertSame( $res, clean_pre( $source ) );
</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">- function test_removes_self_closing_br_without_space() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_self_closing_br_without_space() {
</ins><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"> $this->assertSame( $res, clean_pre( $source ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,13 +26,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // <br> is changed to <br /> elsewhere. Left in because
</span><span class="cx" style="display: block; padding: 0 10px"> // that replacement shouldn't happen (what if you want
</span><span class="cx" style="display: block; padding: 0 10px"> // HTML 4 output?).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_html_br() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_html_br() {
</ins><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"> $this->assertSame( $res, clean_pre( $source ) );
</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">- function test_removes_p() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_p() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $res, clean_pre( $source ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/convertInvalidEntries.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_ConvertInvalidEntities extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_windows1252_entities_with_unicode_ones() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_windows1252_entities_with_unicode_ones() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $input = '‚ƒ„…†‡ˆ‰Š‹Œ‘’“”•–—˜™š›œŸ';
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '‚ƒ„…†‡ˆ‰Š‹Œ‘’“”•–—˜™š›œŸ';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $output, convert_invalid_entities( $input ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20503
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_latin_letter_z_with_caron() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_latin_letter_z_with_caron() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $input = 'Žž';
</span><span class="cx" style="display: block; padding: 0 10px"> $output = 'Žž';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $output, convert_invalid_entities( $input ) );
</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">- function test_escapes_lone_ampersands() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escapes_lone_ampersands() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'at&t', convert_chars( 'at&t' ) );
</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="trunktestsphpunittestsformattingconvertSmiliesphp"></a>
<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/convertSmilies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/convertSmilies.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/convertSmilies.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * Basic Validation Test to confirm that smilies are converted to image
</span><span class="cx" style="display: block; padding: 0 10px"> * when use_smilies = 1 and not when 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">- function test_convert_standard_smilies( $in_txt, $converted_txt ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_convert_standard_smilies( $in_txt, $converted_txt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Standard smilies, use_smilies: ON.
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Validate Custom Smilies are converted to images when use_smilies = 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">- function test_convert_custom_smilies( $in_txt, $converted_txt ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_convert_custom_smilies( $in_txt, $converted_txt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpsmiliestrans;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Custom smilies, use_smilies: ON.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider get_spaces_around_smilies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spaces_around_smilies( $in_txt, $converted_txt ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spaces_around_smilies( $in_txt, $converted_txt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Standard smilies, use_smilies: ON.
</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">
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/date.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 20328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_date_from_gmt_outside_of_dst() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_date_from_gmt_outside_of_dst() {
</ins><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><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"> * @ticket 20328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_date_from_gmt_during_dst() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_date_from_gmt_during_dst() {
</ins><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><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"> * @ticket 20328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_gmt_from_date_outside_of_dst() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_gmt_from_date_outside_of_dst() {
</ins><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><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"> * @ticket 20328
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_gmt_from_date_during_dst() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_gmt_from_date_during_dst() {
</ins><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><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"> * @ticket 34279
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_date_and_time_from_gmt_no_timezone() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_date_and_time_from_gmt_no_timezone() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $gmt, get_date_from_gmt( $local ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34279
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_gmt_from_date_no_timezone() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_gmt_from_date_no_timezone() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $gmt, get_gmt_from_date( $date ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34279
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_gmt_from_date_short_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_gmt_from_date_short_date() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34279
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_gmt_from_date_string_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_gmt_from_date_string_date() {
</ins><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 = 'now';
</span><span class="cx" style="display: block; padding: 0 10px"> $gmt = gmdate( 'Y-m-d H:i:s' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34279
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_gmt_from_date_string_date_no_timezone() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_gmt_from_date_string_date_no_timezone() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $local = 'now';
</span><span class="cx" style="display: block; padding: 0 10px"> $gmt = gmdate( 'Y-m-d H:i:s' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualsWithDelta( strtotime( $gmt ), strtotime( get_gmt_from_date( $local ) ), 2, 'The dates should be equal' );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/ent2ncr.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider entities
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_converts_named_entities_to_numeric_character_references( $entity, $ncr ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_converts_named_entities_to_numeric_character_references( $entity, $ncr ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entity = '&' . $entity . ';';
</span><span class="cx" style="display: block; padding: 0 10px"> $ncr = '&#' . $ncr . ';';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ncr, ent2ncr( $entity ), $entity );
</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"> * Get test data from files, one test per line.
</span><span class="cx" style="display: block; padding: 0 10px"> * Comments start with "###".
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function entities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function entities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entities = file( DIR_TESTDATA . '/formatting/entities.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> $data_provided = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $entities as $line ) {
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/escAttr.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_EscAttr extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_esc_attr_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_attr_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr = '"double quotes"';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '"double quotes"', esc_attr( $attr ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertSame( ''mixed' "quotes"', esc_attr( esc_attr( $attr ) ) );
</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">- function test_esc_attr_amp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_attr_amp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_attr( 'foo & bar &baz; ' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo & bar &baz; ', $out );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/escHtml.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_EscHtml extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_esc_html_basics() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_html_basics() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $html, esc_html( $html ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,19 +20,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $escaped, esc_html( $html ) );
</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">- function test_escapes_ampersands() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escapes_ampersands() {
</ins><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 & teller & at&t';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $res, esc_html( $source ) );
</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">- function test_escapes_greater_and_less_than() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escapes_greater_and_less_than() {
</ins><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 > that < that <randomhtml />';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $res, esc_html( $source ) );
</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">- function test_ignores_existing_entities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignores_existing_entities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $source = '& £ " &';
</span><span class="cx" style="display: block; padding: 0 10px"> $res = '& £ " &';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $res, esc_html( $source ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingescJsphp"></a>
<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/escJs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/escJs.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/escJs.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,18 +4,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_EscJs extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_js_escape_simple() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_escape_simple() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_js( 'foo bar baz();' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo bar baz();', $out );
</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">- function test_js_escape_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_escape_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_js( 'foo "bar" \'baz\'' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Does it make any sense to change " into "? Why not \"?
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "foo "bar" \'baz\'", $out );
</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">- function test_js_escape_backslash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_escape_backslash() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,23 +22,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo t bar ' . $bs . $bs . ' baz', $out );
</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">- function test_js_escape_amp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_escape_amp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_js( 'foo & bar &baz; ' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo & bar &baz; ', $out );
</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">- function test_js_escape_quote_entity() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_escape_quote_entity() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_js( 'foo ' bar ' baz &' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "foo \\' bar \\' baz &", $out );
</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">- function test_js_no_carriage_return() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_no_carriage_return() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_js( "foo\rbar\nbaz\r" );
</span><span class="cx" style="display: block; padding: 0 10px"> // \r is stripped.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "foobar\\nbaz", $out );
</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">- function test_js_escape_rn() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_escape_rn() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = esc_js( "foo\r\nbar\nbaz\r\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> // \r is stripped.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "foo\\nbar\\nbaz\\n", $out );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/escTextarea.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_EscTextarea extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _charset_iso_8859_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function charset_iso_8859_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">@@ -13,14 +13,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Only fails in PHP 5.4 onwards
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_esc_textarea_charset_iso_8859_1() {
- add_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_textarea_charset_iso_8859_1() {
+ add_filter( 'pre_option_blog_charset', array( $this, 'charset_iso_8859_1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $iso8859_1 = 'Fran' . chr( 135 ) . 'ais';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $iso8859_1, esc_textarea( $iso8859_1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_option_blog_charset', array( $this, '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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _charset_utf_8() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function charset_utf_8() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'UTF-8';
</span><span class="cx" style="display: block; padding: 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,10 +27,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_esc_textarea_charset_utf_8() {
- add_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_esc_textarea_charset_utf_8() {
+ add_filter( 'pre_option_blog_charset', array( $this, 'charset_utf_8' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $utf8 = 'Fran' . chr( 195 ) . chr( 167 ) . 'ais';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $utf8, esc_textarea( $utf8 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_option_blog_charset', array( $this, '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></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/escUrl.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23605
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/Mr%20WordPress', esc_url( 'http://example.com/Mr WordPress' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/Mr%20WordPress', esc_url( 'http://example.com/Mr%20WordPress' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/Mr%20%20WordPress', esc_url( 'http://example.com/Mr%20%20WordPress' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/?foo=one%20two%20three&bar=four', esc_url( 'http://example.com/?foo=one%20two%20three&bar=four' ) );
</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">- function test_bad_characters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bad_characters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0Ago' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0ago' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0Dgo' ) );
</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"> $this->assertSame( 'http://example.com/', esc_url( 'http://example.com/%0%0%0ADa' ) );
</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">- function test_relative() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_relative() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '/example.php', esc_url( '/example.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'example.php', esc_url( 'example.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '#fragment', esc_url( '#fragment' ) );
</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"> $this->assertSame( '?foo=bar', esc_url( '?foo=bar' ) );
</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">- function test_all_url_parts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_all_url_parts() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url( $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">- function test_bare() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bare() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com?foo', esc_url( 'example.com?foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com', esc_url( 'example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://localhost', esc_url( 'localhost' ) );
</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"> $this->assertSame( 'http://баба.org/баба', esc_url( 'баба.org/баба' ) );
</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">- function test_encoding() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_encoding() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "http://example.com?url={$param}", esc_url( "http://example.com?url={$param}" ) );
</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">- function test_protocol() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_protocol() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com', esc_url( 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', esc_url( 'nasty://example.com/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,23 +146,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23187
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_protocol_case() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_protocol_case() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com', esc_url( 'HTTP://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com', esc_url( 'Http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_display_extras() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_display_extras() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/'quoted'', esc_url( 'http://example.com/\'quoted\'' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/\'quoted\'', esc_url( 'http://example.com/\'quoted\'', null, 'notdisplay' ) );
</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">- function test_non_ascii() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_non_ascii() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.org/баба', esc_url( 'http://example.org/баба' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://баба.org/баба', esc_url( 'http://баба.org/баба' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://müller.com/', esc_url( 'http://müller.com/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', esc_url( 'feed:javascript:alert(1)' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', esc_url( 'feed:javascript:feed:alert(1)' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', esc_url( 'feed:feed:javascript:alert(1)' ) );
</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"> * @ticket 16859
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_square_brackets() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_square_brackets() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '/example.php?one%5B%5D=two', esc_url( '/example.php?one[]=two' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '?foo%5Bbar%5D=baz', esc_url( '?foo[bar]=baz' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '//example.com/?foo%5Bbar%5D=baz', esc_url( '//example.com/?foo[bar]=baz' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Courtesy of http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_reserved_characters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_reserved_characters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$%27()*+,;=/?:@-._~!$%27()*+,;==#/?:@-._~!$&'()*+,;=";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $url, esc_url_raw( $url ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21974
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_protocol_relative_with_colon() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_protocol_relative_with_colon() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '//example.com/foo?foo=abc:def', esc_url( '//example.com/foo?foo=abc:def' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31632
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mailto_with_newline() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mailto_with_newline() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body = <<<EOT
</span><span class="cx" style="display: block; padding: 0 10px"> Hi there,
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31632
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mailto_in_http_url_with_newline() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mailto_in_http_url_with_newline() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body = <<<EOT
</span><span class="cx" style="display: block; padding: 0 10px"> Hi there,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23605
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mailto_with_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mailto_with_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body = 'Hi there, I thought you might want to sign up for this newsletter';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28015
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_charaters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_charaters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( esc_url_raw( '"^<>{}`' ) );
</span><span class="cx" style="display: block; padding: 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,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34202
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ipv6_hosts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ipv6_hosts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '//[::127.0.0.1]', esc_url( '//[::127.0.0.1]' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://[::FFFF::127.0.0.1]', esc_url( 'http://[::FFFF::127.0.0.1]' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://[::127.0.0.1]', esc_url( 'http://[::127.0.0.1]' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/excerptRemoveBlocks.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @return string Block 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">- function render_fake_block() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function render_fake_block() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_the_excerpt( self::$post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_id = $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">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><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"> $registry->unregister( 'core/fake' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46133
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_excerpt_remove_blocks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_excerpt_remove_blocks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Simple dynamic block..
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '<!-- wp:core/block /-->';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46133
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_excerpt_infinite_loop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_excerpt_infinite_loop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post__in' => array( self::$post_id ),
</span></span></pre></div>
<a id="trunktestsphpunittestsformattinggetBloginfophp"></a>
<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/getBloginfo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/getBloginfo.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/getBloginfo.php 2021-11-04 15:22:47 UTC (rev 52010)
</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 locales
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28303
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_bloginfo_language( $test_locale, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_bloginfo_language( $test_locale, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $locale;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_locale = $locale;
</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"> $locale = $old_locale;
</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">- function locales() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function locales() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Locale, language code.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'en_US', 'en-US' ),
</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"> * @ticket 27942
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bloginfo_sanitize_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bloginfo_sanitize_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_values = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogname' => get_option( 'blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogdescription' => get_option( 'blogdescription' ),
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/getUrlInContent.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @dataProvider get_input_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">- function test_get_url_in_content( $in_str, $exp_str ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_url_in_content( $in_str, $exp_str ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $exp_str, get_url_in_content( $in_str ) );
</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="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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/humanTimeDiff.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,13 +11,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38773
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_test_human_time_diff
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_human_time_diff( $expected, $stopdate, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_human_time_diff( $expected, $stopdate, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $startdate = new DateTime( '2016-01-01 12:00:00' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, human_time_diff( $startdate->format( 'U' ), $stopdate->format( 'U' ) ), $message );
</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"> // Data for test_human_time_diff.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_test_human_time_diff() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_test_human_time_diff() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '37 seconds',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/isEmail.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_IsEmail extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_returns_the_email_address_if_it_is_valid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_returns_the_email_address_if_it_is_valid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bob@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'phil@example.info',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_returns_false_if_given_an_invalid_email_address() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_returns_false_if_given_an_invalid_email_address() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'khaaaaaaaaaaaaaaan!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://bob.example.com/',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/likeEscape.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 10041
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated like_escape
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_like_escape() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_like_escape() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'howdy%', // Single percent.
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/linksAddTarget.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_normalize_whitespace( $content, $target, $tags, $exp_str ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_normalize_whitespace( $content, $target, $tags, $exp_str ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( true === is_null( $target ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $exp_str, links_add_target( $content ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === is_null( $tags ) ) {
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/makeClickable.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,12 +4,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_MakeClickable extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mailto_xss() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mailto_xss() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $in = 'testzzz@"STYLE="behavior:url(\'#default#time2\')"onBegin="alert(\'refresh-XSS\')"';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $in, make_clickable( $in ) );
</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">- function test_valid_mailto() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_mailto() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $valid_emails = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo.bar@example.com',
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_mailto() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_mailto() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $invalid_emails = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo@',
</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"> * Tests that make_clickable() will not link trailing periods, commas,
</span><span class="cx" style="display: block; padding: 0 10px"> * and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_trailing_with_protocol() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_trailing_with_protocol() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://wordpress.org/hello.html',
</span><span class="cx" style="display: block; padding: 0 10px"> 'There was a spoon named http://wordpress.org. Alice!',
</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"> * Tests that make_clickable() will not link trailing periods, commas,
</span><span class="cx" style="display: block; padding: 0 10px"> * and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_trailing_with_protocol_nothing_afterwards() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_trailing_with_protocol_nothing_afterwards() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://wordpress.org/hello.html',
</span><span class="cx" style="display: block; padding: 0 10px"> 'There was a spoon named http://wordpress.org.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests that make_clickable() will not link trailing periods, commas,
</span><span class="cx" style="display: block; padding: 0 10px"> * and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_trailing_without_protocol() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_trailing_without_protocol() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'www.wordpress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'There was a spoon named www.wordpress.org. Alice!',
</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"> * Tests that make_clickable() will not link trailing periods, commas,
</span><span class="cx" style="display: block; padding: 0 10px"> * and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_trailing_without_protocol_nothing_afterwards() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_trailing_without_protocol_nothing_afterwards() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'www.wordpress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'There was a spoon named www.wordpress.org.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4570
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_iri() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_iri() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://www.詹姆斯.com/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://bg.wikipedia.org/Баба',
</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"> * @ticket 10990
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_brackets_in_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_brackets_in_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)',
</span><span class="cx" style="display: block; padding: 0 10px"> '(http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software))',
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11211
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_real_world_examples() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_real_world_examples() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Example: WordPress, test (some text), I love example.com (http://example.org), it is brilliant',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Example: WordPress, test (some text), I love example.com (http://example.com), it is brilliant',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14993
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_twitter_hash_bang() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_twitter_hash_bang() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://twitter.com/#!/wordpress/status/25907440233',
</span><span class="cx" style="display: block; padding: 0 10px"> 'This is a really good tweet http://twitter.com/#!/wordpress/status/25907440233 !',
</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"> }
</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">- function test_wrapped_in_angles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wrapped_in_angles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'URL wrapped in angle brackets <http://example.com/>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'URL wrapped in angle brackets with padding < http://example.com/ >',
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_preceded_by_punctuation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preceded_by_punctuation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Comma then URL,http://example.com/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Period then URL.http://example.com/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,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">- function test_dont_break_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dont_break_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>",
</span><span class="cx" style="display: block; padding: 0 10px"> "(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_links_inside_pre_or_code() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_links_inside_pre_or_code() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<pre>http://wordpress.org</pre>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>http://wordpress.org</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16892
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_click_inside_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_click_inside_html() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_before = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<span>http://example.com</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>http://example.com/</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,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">- function test_no_links_within_links() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_links_within_links() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $in = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Some text with a link <a href="http://example.com">http://example.com</a>',
</span><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="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"> * @ticket 16892
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_segfault() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_segfault() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $in, $out );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19028
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_line_break_in_existing_clickable_link() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_line_break_in_existing_clickable_link() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $html, make_clickable( $html ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/normalizeWhitespace.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider get_input_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">- function test_normalize_whitespace( $in_str, $exp_str ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_normalize_whitespace( $in_str, $exp_str ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $exp_str, normalize_whitespace( $in_str ) );
</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="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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/redirect.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,12 +6,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group redirect
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_Redirect extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'home_url', array( $this, 'home_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">- function home_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function home_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'http://example.com/';
</span><span class="cx" style="display: block; padding: 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"> );
</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">- function test_wp_sanitize_redirect() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_sanitize_redirect() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0Ago' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0ago' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0Dgo' ) );
</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"> * @ticket 36998
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_sanitize_redirect_should_encode_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_sanitize_redirect_should_encode_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/test%20spaces', wp_sanitize_redirect( 'http://example.com/test%20spaces' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com/test%20spaces%20in%20url', wp_sanitize_redirect( 'http://example.com/test spaces in url' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @dataProvider valid_url_provider
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_validate_redirect_valid_url( $url, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_validate_redirect_valid_url( $url, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_validate_redirect( $url ) );
</span><span class="cx" style="display: block; padding: 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,11 +75,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider invalid_url_provider
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_validate_redirect_invalid_url( $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_validate_redirect_invalid_url( $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_validate_redirect( $url, false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function valid_url_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function valid_url_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'http://example.com', 'http://example.com' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'http://example.com/', 'http://example.com/' ),
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function invalid_url_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function invalid_url_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // parse_url() fails.
</span><span class="cx" style="display: block; padding: 0 10px"> array( '' ),
</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"> * @ticket 47980
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider relative_url_provider
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_validate_redirect_relative_url( $current_uri, $url, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_validate_redirect_relative_url( $current_uri, $url, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Backup the global.
</span><span class="cx" style="display: block; padding: 0 10px"> $unset = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_SERVER['REQUEST_URI'] ) ) {
</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"> * string Expected destination.
</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">- function relative_url_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function relative_url_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/removeAccents.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> $this->assertSame( 'aaeiouuAEIOUU', remove_accents( 'aɑeiouüAEIOUÜ' ) );
</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">- function _remove_accents_germanic_umlauts_cb() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function remove_accents_germanic_umlauts_cb() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'de_DE';
</span><span class="cx" style="display: block; padding: 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"> * @ticket 3782
</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_germanic_umlauts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'locale', array( $this, '_remove_accents_germanic_umlauts_cb' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'locale', array( $this, 'remove_accents_germanic_umlauts_cb' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'AeOeUeaeoeuess', remove_accents( 'ÄÖÜäöüß' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'locale', array( $this, '_remove_accents_germanic_umlauts_cb' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'locale', array( $this, 'remove_accents_germanic_umlauts_cb' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _set_locale_to_danish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_locale_to_danish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'da_DK';
</span><span class="cx" style="display: block; padding: 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,14 +103,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23907
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_danish_accents() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'locale', array( $this, '_set_locale_to_danish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'locale', array( $this, 'set_locale_to_danish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'locale', array( $this, '_set_locale_to_danish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'locale', array( $this, 'set_locale_to_danish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _set_locale_to_catalan() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_locale_to_catalan() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'ca';
</span><span class="cx" style="display: block; padding: 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,16 +118,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37086
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_catalan_middot() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'locale', array( $this, '_set_locale_to_catalan' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'locale', array( $this, 'set_locale_to_catalan' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'allallalla', remove_accents( 'al·lallaŀla' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'locale', array( $this, '_set_locale_to_catalan' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'locale', array( $this, 'set_locale_to_catalan' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'al·lallalla', remove_accents( 'al·lallaŀla' ) );
</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">- public function _set_locale_to_serbian() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_locale_to_serbian() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'sr_RS';
</span><span class="cx" style="display: block; padding: 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,11 +135,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38078
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_transcribe_serbian_crossed_d() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'locale', array( $this, '_set_locale_to_serbian' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'locale', array( $this, 'set_locale_to_serbian' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'DJdj', remove_accents( 'Đđ' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'locale', array( $this, '_set_locale_to_serbian' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'locale', array( $this, 'set_locale_to_serbian' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Dd', remove_accents( 'Đđ' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeFileName.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_SanitizeFileName extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_munges_extensions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_munges_extensions() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test.phtml_.txt', $file_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_special_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_special_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $special_chars = array( '?', '[', ']', '/', '\\', '=', '<', '>', ':', ';', ',', "'", '"', '&', '$', '#', '*', '(', ')', '|', '~', '`', '!', '{', '}', '%', '+', '’', '«', '»', '”', '“', chr( 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $string = 'test';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $special_chars as $char ) {
</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"> * @ticket 22363
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_accents() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_accents() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $in = 'àáâãäåæçèéêëìíîïñòóôõöøùúûüýÿ';
</span><span class="cx" style="display: block; padding: 0 10px"> $out = 'aaaaaaaeceeeeiiiinoooooouuuuyy';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $out, sanitize_file_name( $in ) );
</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"> * @ticket 16330
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'unencoded space.png' => 'unencoded-space.png',
</span><span class="cx" style="display: block; padding: 0 10px"> 'encoded-space.jpg' => 'encoded-space.jpg',
</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"> }
</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">- function test_replaces_any_number_of_hyphens_with_one_hyphen() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_any_number_of_hyphens_with_one_hyphen() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t-t', sanitize_file_name( 'a----t----t' ) );
</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">- function test_trims_trailing_hyphens() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_trailing_hyphens() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t-t', sanitize_file_name( 'a----t----t----' ) );
</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">- function test_replaces_any_amount_of_whitespace_with_one_hyphen() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_any_amount_of_whitespace_with_one_hyphen() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t', sanitize_file_name( 'a t' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t', sanitize_file_name( "a \n\n\nt" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,17 +63,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16226
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_percent_sign() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_percent_sign() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a22b.jpg', sanitize_file_name( 'a%22b.jpg' ) );
</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">- function test_replaces_unnamed_file_extensions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_unnamed_file_extensions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test filenames with both supported and unsupported extensions.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'unnamed-file.jpg', sanitize_file_name( '_.jpg' ) );
</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">- function test_replaces_unnamed_file_extensionless() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_unnamed_file_extensionless() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test a filenames that becomes extensionless.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'no-extension', sanitize_file_name( '_.no-extension' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,11 +81,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_invalid_utf8_characters( $input, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_invalid_utf8_characters( $input, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, sanitize_file_name( $input ) );
</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">- function data_wp_filenames() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_filenames() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( urldecode( '%B1myfile.png' ), 'myfile.png' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( urldecode( '%B1myfile' ), 'myfile' ),
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeMimeType.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17855
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_valid_mime_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_valid_mime_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'application/atom+xml',
</span><span class="cx" style="display: block; padding: 0 10px"> 'application/EDI-X12',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeOrderby.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::sanitize_sql_orderby
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider valid_orderbys
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid( $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid( $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $orderby, sanitize_sql_orderby( $orderby ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function valid_orderbys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function valid_orderbys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '1' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '1 ASC' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,10 +36,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::sanitize_sql_orderby
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider invalid_orderbys
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid( $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid( $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( sanitize_sql_orderby( $orderby ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function invalid_orderbys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function invalid_orderbys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '1 2' ),
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingsanitizePostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/sanitizePost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/sanitizePost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizePost.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22324
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_int_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_int_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 'integer',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeTextField.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_SanitizeTextField extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_sanitize_text_field() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_sanitize_text_field() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'оРангутанг', // Ensure UTF-8 text is safe. The Р is D0 A0 and A0 is the non-breaking space.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32257
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_sanitize_text_field
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_text_field( $string, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_text_field( $string, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $expected ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_oneline = $expected['oneline'];
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_multiline = $expected['multiline'];
</span></span></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeTitle.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_SanitizeTitle extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strips_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_html() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, sanitize_title( $input ) );
</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">- function test_titles_sanitized_to_nothing_are_replaced_with_optional_fallback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_titles_sanitized_to_nothing_are_replaced_with_optional_fallback() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $fallback, sanitize_title( $input, $fallback ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeTitleWithDashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,34 +4,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_SanitizeTitleWithDashes extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strips_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_html() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, sanitize_title_with_dashes( $input ) );
</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">- function test_strips_unencoded_percent_signs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_unencoded_percent_signs() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'fran%c3%a7ois', sanitize_title_with_dashes( 'fran%c3%a7%ois' ) );
</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">- function test_makes_title_lowercase() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_makes_title_lowercase() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'abc', sanitize_title_with_dashes( 'ABC' ) );
</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">- function test_replaces_any_amount_of_whitespace_with_one_hyphen() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_any_amount_of_whitespace_with_one_hyphen() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t', sanitize_title_with_dashes( 'a t' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t', sanitize_title_with_dashes( "a \n\n\nt" ) );
</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">- function test_replaces_any_number_of_hyphens_with_one_hyphen() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_any_number_of_hyphens_with_one_hyphen() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t-t', sanitize_title_with_dashes( 'a----t----t' ) );
</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">- function test_trims_trailing_hyphens() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_trailing_hyphens() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a-t-t', sanitize_title_with_dashes( 'a----t----t----' ) );
</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">- function test_handles_non_entity_ampersands() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_handles_non_entity_ampersands() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'penn-teller-bull', sanitize_title_with_dashes( 'penn & teller bull' ) );
</span><span class="cx" style="display: block; padding: 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"> $this->assertSame( 'onetwo', sanitize_title_with_dashes( 'One&Two', '', 'save' ) );
</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">- function test_replaces_nbsp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_nbsp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'dont-break-the-space', sanitize_title_with_dashes( "don't break the space", '', 'save' ) );
</span><span class="cx" style="display: block; padding: 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,11 +66,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31790
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_nbsp_entities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_nbsp_entities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'dont-break-the-space', sanitize_title_with_dashes( "don't break the space", '', 'save' ) );
</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">- function test_replaces_ndash_mdash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_ndash_mdash() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do – the Dash', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do the — Dash', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,22 +78,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31790
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_ndash_mdash_entities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_ndash_mdash_entities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do – the – Dash', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do — the — Dash', '', 'save' ) );
</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">- function test_replaces_iexcel_iquest() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_iexcel_iquest() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just ¡a Slug', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just a Slug¿', '', 'save' ) );
</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">- function test_replaces_angle_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_angle_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( '‹Just a Slug›', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( '«Just a Slug»', '', 'save' ) );
</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">- function test_replaces_curly_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_curly_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its “Curly Joe”', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its ‘Curly Joe’', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its „Curly Joe“', '', 'save' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49791
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_bullet() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_bullet() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'fancy-title-amazing', sanitize_title_with_dashes( 'Fancy Title • Amazing', '', 'save' ) );
</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">- function test_replaces_copy_reg_deg_trade() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_copy_reg_deg_trade() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just © a Slug', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( '® Just a Slug', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just a ° Slug', '', 'save' ) );
</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"> * @ticket 10792
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_forward_slash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_forward_slash() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon/McCartney', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon//McCartney', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon///McCartney', '', 'save' ) );
</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><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19820
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_multiply_sign() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_multiply_sign() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '6x7-is-42', sanitize_title_with_dashes( '6×7 is 42', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 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"> * @ticket 20772
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_standalone_diacritic() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_standalone_diacritic() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'aaaa', sanitize_title_with_dashes( 'āáǎà', '', 'save' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22395
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_replaces_acute_accents() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_replaces_acute_accents() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'aaaa', sanitize_title_with_dashes( 'ááa´aˊ', '', 'save' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,11 +8,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21624
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider breaks
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_trackback_urls_with_multiple_urls( $break ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_trackback_urls_with_multiple_urls( $break ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "http://example.com\nhttp://example.org", sanitize_trackback_urls( "http://example.com{$break}http://example.org" ) );
</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">- function breaks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function breaks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( "\r\n\t " ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( "\r" ),
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/sanitizeUser.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_SanitizeUser extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strips_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_html() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, sanitize_user( $input ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,11 +32,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, sanitize_user( 'AT&T 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">- function test_strips_percent_encoded_octets() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_percent_encoded_octets() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = is_multisite() ? 'franois' : 'Franois';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, sanitize_user( 'Fran%c3%a7ois' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_optional_strict_mode_reduces_to_safe_ascii_subset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_optional_strict_mode_reduces_to_safe_ascii_subset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'abc', sanitize_user( '()~ab~ˆcˆ!', true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingseemsUtf8php"></a>
<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/seemsUtf8.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/seemsUtf8.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/seemsUtf8.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider utf8_strings
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_returns_true_for_utf8_strings( $utf8_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_returns_true_for_utf8_strings( $utf8_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // From http://www.i18nguy.com/unicode-example.html
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( seems_utf8( $utf8_string ) );
</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">- function utf8_strings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function utf8_strings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $utf8_strings = file( DIR_TESTDATA . '/formatting/utf-8/utf-8.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $utf8_strings as &$string ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $string = (array) trim( $string );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,11 +27,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider big5_strings
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_returns_false_for_non_utf8_strings( $big5_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_returns_false_for_non_utf8_strings( $big5_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( seems_utf8( $big5_string ) );
</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">- function big5_strings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function big5_strings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get data from formatting/big5.txt.
</span><span class="cx" style="display: block; padding: 0 10px"> $big5_strings = file( DIR_TESTDATA . '/formatting/big5.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $big5_strings as &$string ) {
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/slashit.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,19 +4,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_backslashes_middle_numbers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_backslashes_middle_numbers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "\\a-!9\\a943\\b\\c", backslashit( 'a-!9a943bc' ) );
</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">- function test_backslashes_alphas() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_backslashes_alphas() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "\\a943\\b\\c", backslashit( 'a943bc' ) );
</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">- function test_double_backslashes_leading_numbers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_double_backslashes_leading_numbers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '\\\\95', backslashit( '95' ) );
</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">- function test_removes_trailing_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_trailing_slashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a', untrailingslashit( 'a/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a', untrailingslashit( 'a////' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22267
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_trailing_backslashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_trailing_backslashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a', untrailingslashit( 'a\\' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a', untrailingslashit( 'a\\\\\\\\' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22267
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_removes_trailing_mixed_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_removes_trailing_mixed_slashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a', untrailingslashit( 'a/\\' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a', untrailingslashit( 'a\\/\\///\\\\//' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_adds_trailing_slash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_adds_trailing_slash() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a/', trailingslashit( 'a' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_does_not_add_trailing_slash_if_one_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_does_not_add_trailing_slash_if_one_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a/', trailingslashit( 'a/' ) );
</span><span class="cx" style="display: block; padding: 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,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22267
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_converts_trailing_backslash_to_slash_if_one_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_converts_trailing_backslash_to_slash_if_one_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'a/', trailingslashit( 'a\\' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/stripslashesDeep.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18026
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_preserves_original_datatype() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preserves_original_datatype() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( stripslashes_deep( true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripslashes_deep( false ) );
</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"> $this->assertSame( $obj, stripslashes_deep( $obj ) );
</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">- function test_strips_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_slashes() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $new, stripslashes_deep( $old ) );
</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"> $this->assertEquals( $obj_new, stripslashes_deep( $obj_old ) );
</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">- function test_permits_escaped_slash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_permits_escaped_slash() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $txt = "I can't see, isn\'t that it?";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $txt, stripslashes_deep( "I can\'t see, isn\\\'t that it?" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $txt, stripslashes_deep( "I can\'t see, isn\\\\\'t that it?" ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/urlShorten.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_UrlShorten extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_url_shorten() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_shorten() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tests = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress\.org/about/philosophy' => 'wordpress\.org/about/philosophy', // No longer strips slashes.
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress.org/about/philosophy' => 'wordpress.org/about/philosophy',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/utf8UriEncode.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @dataProvider 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">- function test_percent_encodes_non_reserved_characters( $utf8, $urlencoded ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_percent_encodes_non_reserved_characters( $utf8, $urlencoded ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $urlencoded, utf8_uri_encode( $utf8 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,12 +18,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider 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">- function test_output_is_not_longer_than_optional_length_argument( $utf8, $unused_for_this_test ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_output_is_not_longer_than_optional_length_argument( $utf8, $unused_for_this_test ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_length = 30;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( strlen( utf8_uri_encode( $utf8, $max_length ) ) <= $max_length );
</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">- function data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $utf8_urls = file( DIR_TESTDATA . '/formatting/utf-8/utf-8.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> $urlencoded = file( DIR_TESTDATA . '/formatting/utf-8/urlencoded.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> $data_provided = array();
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingwpAutopphp"></a>
<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/wpAutop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/wpAutop.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpAutop.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11008
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_first_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_first_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = '<p>Welcome to WordPress! This post contains important information. After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>First things first:</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27268
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_treats_block_level_elements_as_blocks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_treats_block_level_elements_as_blocks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blocks = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'table',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thead',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27268
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_does_not_wrap_blockquotes_but_does_autop_their_contents() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_does_not_wrap_blockquotes_but_does_autop_their_contents() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27268
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_treats_inline_elements_as_inline() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_treats_inline_elements_as_inline() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inlines = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'em',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,11 +438,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33106
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_element_sanity( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_element_sanity( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wpautop( $input ) );
</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">- function data_element_sanity() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_element_sanity() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "Hello <a\nhref='world'>",
</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"> * @ticket 33377
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_skips_line_breaks_after_br() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_skips_line_breaks_after_br() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = '
</span><span class="cx" style="display: block; padding: 0 10px"> line 1<br>
</span><span class="cx" style="display: block; padding: 0 10px"> line 2<br/>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33377
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_adds_a_paragraph_after_multiple_br() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_adds_a_paragraph_after_multiple_br() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = '
</span><span class="cx" style="display: block; padding: 0 10px"> line 1<br>
</span><span class="cx" style="display: block; padding: 0 10px"> <br/>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +531,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4857
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_text_before_blocks_is_peed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_text_before_blocks_is_peed() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +546,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39307
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_does_not_add_extra_closing_p_in_figure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_does_not_add_extra_closing_p_in_figure() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content1 = '<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
</span><span class="cx" style="display: block; padding: 0 10px"> $expected1 = $content1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,7 +565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_hr_is_not_peed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_hr_is_not_peed() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9437
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_ignores_inline_svgs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_ignores_inline_svgs() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content =
</span><span class="cx" style="display: block; padding: 0 10px"> '<svg xmlns="http://www.w3.org/2000/svg">
</span><span class="cx" style="display: block; padding: 0 10px"> <circle cx="50" cy="50" r="30" fill="blue">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +595,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9437
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_that_wpautop_ignores_inline_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_that_wpautop_ignores_inline_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content =
</span><span class="cx" style="display: block; padding: 0 10px"> '<script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> var dummy = 1;
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpBasename.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_wpBasename extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_basename_unix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_basename_unix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_basename_unix_utf8_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_basename_unix_utf8_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><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="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"> * @ticket 22138
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_basename_windows() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_basename_windows() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22138
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_basename_windows_utf8_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_basename_windows_utf8_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><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></pre></div>
<a id="trunktestsphpunittestsformattingwpHtmlExcerptphp"></a>
<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/wpHtmlExcerpt.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/wpHtmlExcerpt.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpHtmlExcerpt.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_wpHtmlExcerpt extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_simple() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_simple() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Baba', wp_html_excerpt( 'Baba told me not to come', 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">- function test_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_html() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Baba', wp_html_excerpt( "<a href='http://baba.net/'>Baba</a> told me not to come", 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">- function test_entities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_entities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Baba', wp_html_excerpt( 'Baba & Dyado', 8 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Baba', wp_html_excerpt( 'Baba & Dyado', 8 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Baba & D', wp_html_excerpt( 'Baba & Dyado', 12 ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpHtmlSplit.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_basic_features( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_basic_features( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_html_split( $input ) );
</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">- function data_basic_features() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_basic_features() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'abcd efgh',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,13 +40,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_whole_posts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pcre_performance( $input ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pcre_performance( $input ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $regex = get_html_split_regex();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = benchmark_pcre_backtracking( $regex, $input, 'split' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertLessThan( 200, $result );
</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">- function data_whole_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_whole_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/formatting/whole-posts.php';
</span><span class="cx" style="display: block; padding: 0 10px"> return data_whole_posts();
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpHtmleditPre.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_wpHtmleditPre extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _charset_iso_8859_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function charset_iso_8859_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">@@ -14,14 +14,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Only fails in PHP 5.4 onwards
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_htmledit_pre_charset_iso_8859_1() {
- add_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_htmledit_pre_charset_iso_8859_1() {
+ add_filter( 'pre_option_blog_charset', array( $this, 'charset_iso_8859_1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $iso8859_1 = 'Fran' . chr( 135 ) . 'ais';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $iso8859_1, wp_htmledit_pre( $iso8859_1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_option_blog_charset', array( $this, '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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _charset_utf_8() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function charset_utf_8() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'UTF-8';
</span><span class="cx" style="display: block; padding: 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,10 +28,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_htmledit_pre_charset_utf_8() {
- add_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_htmledit_pre_charset_utf_8() {
+ add_filter( 'pre_option_blog_charset', array( $this, 'charset_utf_8' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $utf8 = 'Fran' . chr( 195 ) . chr( 167 ) . 'ais';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $utf8, wp_htmledit_pre( $utf8 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_option_blog_charset', array( $this, '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></pre></div>
<a id="trunktestsphpunittestsformattingwpIsoDescramblerphp"></a>
<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/wpIsoDescrambler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/wpIsoDescrambler.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpIsoDescrambler.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Decodes text in RFC2047 "Q"-encoding, e.g.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_decodes_iso_8859_1_rfc2047_q_encoding() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_decodes_iso_8859_1_rfc2047_q_encoding() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'this is some text', wp_iso_descrambler( '=?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"> }
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpMakeLinkRelative.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26819
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_make_link_relative_with_no_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_make_link_relative_with_no_path() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $relative_link );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpReplaceInHtmlTags.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_replace_in_html_tags( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_replace_in_html_tags( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_replace_in_html_tags( $input, array( "\n" => ' ' ) ) );
</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">- function data_wp_replace_in_html_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_replace_in_html_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "Hello \n World",
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpRicheditPre.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_wpRicheditPre extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _charset_iso_8859_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function charset_iso_8859_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">@@ -14,14 +14,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Only fails in PHP 5.4 onwards
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_richedit_pre_charset_iso_8859_1() {
- add_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_richedit_pre_charset_iso_8859_1() {
+ add_filter( 'pre_option_blog_charset', array( $this, 'charset_iso_8859_1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $iso8859_1 = 'Fran' . chr( 135 ) . 'ais';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<p>' . $iso8859_1 . "</p>\n", wp_richedit_pre( $iso8859_1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_option_blog_charset', array( $this, '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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _charset_utf_8() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function charset_utf_8() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'UTF-8';
</span><span class="cx" style="display: block; padding: 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,10 +28,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_richedit_pre_charset_utf_8() {
- add_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_richedit_pre_charset_utf_8() {
+ add_filter( 'pre_option_blog_charset', array( $this, 'charset_utf_8' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $utf8 = 'Fran' . chr( 195 ) . chr( 167 ) . 'ais';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<p>' . $utf8 . "</p>\n", wp_richedit_pre( $utf8 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_option_blog_charset', array( $this, '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></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpSlash.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24106
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_adds_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_adds_slashes() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $new, wp_slash( $old ) );
</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"> * @ticket 24106
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_preserves_original_datatype() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preserves_original_datatype() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_slash( true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_slash( false ) );
</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"> * @ticket 24106
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_even_more_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_even_more_slashes() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $new, wp_slash( $old ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpSpecialchars.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_wpSpecialchars extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_specialchars_basics() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_specialchars_basics() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '&<hello world>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $html, _wp_specialchars( $html ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertSame( $double, _wp_specialchars( $html, ENT_NOQUOTES, false, 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">- function test_allowed_entity_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allowed_entity_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedentitynames;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allowed entities should be unchanged.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_not_allowed_entity_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_not_allowed_entity_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ents = array( 'iacut', 'aposs', 'pos', 'apo', 'apo?', 'apo.*', '.*apo.*', 'apos ', ' apos', ' apos ' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ents as $ent ) {
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_optionally_escapes_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_optionally_escapes_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $source = "\"'hello!'\"";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '"'hello!'"', _wp_specialchars( $source, 'single' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( ""'hello!'"", _wp_specialchars( $source, 'double' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,11 +50,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17780
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_double_encoding( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_double_encoding( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, _wp_specialchars( $input, ENT_NOQUOTES, false, 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">- function data_double_encoding() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_double_encoding() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'This & that, this & that, — " " Ú " " " " " $ ×',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,11 +77,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17780
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_double_encoding( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_double_encoding( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, _wp_specialchars( $input, ENT_NOQUOTES, false, false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_no_double_encoding() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_no_double_encoding() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'This & that, this & that, — " " Ú " " " " " $ ×',
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpStripAllTags.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_wpStripAllTags extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_strip_all_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_strip_all_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text = 'lorem<br />ipsum';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'loremipsum', wp_strip_all_tags( $text ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpTexturize.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,12 +4,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Hey — boo?', wptexturize( 'Hey -- boo?' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<a href="http://xx--xx">Hey — boo?</a>', wptexturize( '<a href="http://xx--xx">Hey -- boo?</a>' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_disable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_disable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<pre>---&</pre>', wptexturize( '<pre>---&</pre>' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<pre><code></code>--&</pre>', wptexturize( '<pre><code></code>--&</pre>' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 1418
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bracketed_quotes_1418() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bracketed_quotes_1418() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '(“test”)', wptexturize( '("test")' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '(‘test’)', wptexturize( "('test')" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '(’twas)', wptexturize( "('twas)" ) );
</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"> * @ticket 3810
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bracketed_quotes_3810() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bracketed_quotes_3810() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'A dog (“Hubertus”) was sent out.', wptexturize( 'A dog ("Hubertus") was sent out.' ) );
</span><span class="cx" style="display: block; padding: 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_basic_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_basic_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test’s', wptexturize( 'test\'s' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '‘quoted’', wptexturize( '\'quoted\'' ) );
</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"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15241
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_full_sentences_with_unmatched_single_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_full_sentences_with_unmatched_single_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> '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"> wptexturize( "That means every moment you're working on something without it being in the public it's actually dying." )
</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"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '“Quoted String”', wptexturize( '"Quoted String"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->assertSame( 'Here is “<a href="http://example.com">a test with a link</a>”', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->assertSame( 'Here is “<a href="http://example.com">a test with a link and a period</a>”.', wptexturize( 'Here is "<a href="http://example.com">a test with a link and a period</a>".' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_quotes_before_s() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_quotes_before_s() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test’s', wptexturize( "test's" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '‘test’s', wptexturize( "'test's" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '‘test’s’', wptexturize( "'test's'" ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_quotes_before_numbers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_quotes_before_numbers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Class of ’99', wptexturize( "Class of '99" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Class of ’99’s', wptexturize( "Class of '99's" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '‘Class of ’99’', wptexturize( "'Class of '99'" ) );
</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"> $this->assertSame( '}”Class of ’99″{', wptexturize( "}\"Class of '99\"{" ) );
</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">- function test_quotes_after_numbers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_quotes_after_numbers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Class of ’99', wptexturize( "Class of '99" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,17 +149,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15241
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_other_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_other_html() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '‘<strong>', wptexturize( "'<strong>" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->assertSame( '‘<strong>Quoted Text</strong>’,', wptexturize( "'<strong>Quoted Text</strong>'," ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->assertSame( '“<strong>Quoted Text</strong>”,', wptexturize( '"<strong>Quoted Text</strong>",' ) );
</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">- function test_x() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_x() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '14×24', wptexturize( '14x24' ) );
</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">- function test_minutes_seconds() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_minutes_seconds() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '9′', wptexturize( '9\'' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '9″', wptexturize( '9"' ) );
</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"> * @ticket 8775
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wptexturize_quotes_around_numbers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wptexturize_quotes_around_numbers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '“12345”', wptexturize( '"12345"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '‘12345’', wptexturize( '\'12345\'' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '“a 9′ plus a ‘9’, maybe a 9′ ‘9’”', wptexturize( '"a 9\' plus a \'9\', maybe a 9\' \'9\'"' ) );
</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"> * @ticket 8912
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wptexturize_html_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wptexturize_html_comments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<!--[if !IE]>--><!--<![endif]-->', wptexturize( '<!--[if !IE]>--><!--<![endif]-->' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $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]-->' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>', wptexturize( '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>' ) );
</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"> * @ticket 4539
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15241
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_entity_quote_cuddling() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_entity_quote_cuddling() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( ' “Testing”', wptexturize( ' "Testing"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // $this->assertSame( '&“Testing”', wptexturize( '&"Testing"' ) );
</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"> * @ticket 22823
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_apostrophes_before_primes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_apostrophes_before_primes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WordPress 3.5’s release date', wptexturize( "WordPress 3.5's release date" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23185
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spaces_around_hyphens() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spaces_around_hyphens() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nbsp = "\xC2\xA0";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( ' – ', wptexturize( ' - ' ) );
</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"> * @ticket 31030
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hyphens_at_start_and_end() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hyphens_at_start_and_end() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '– ', wptexturize( '- ' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '– –', wptexturize( '- -' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( ' –', wptexturize( ' -' ) );
</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"> * @ticket 22692
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spaces_around_quotes_never() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spaces_around_quotes_never() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nbsp = "\xC2\xA0";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $problem_input = "$nbsp\"A";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,11 +265,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spaces_around_quotes( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spaces_around_quotes( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_spaces_around_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_spaces_around_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nbsp = "\xC2\xA0";
</span><span class="cx" style="display: block; padding: 0 10px"> $pi = "\xCE\xA0";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,11 +321,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_apos_before_digits( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_apos_before_digits( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_apos_before_digits() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_apos_before_digits() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word '99 word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,11 +362,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_opening_single_quote( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_opening_single_quote( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_opening_single_quote() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_opening_single_quote() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word 'word word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,11 +491,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_double_prime( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_double_prime( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_double_prime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_double_prime() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word 99" word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,11 +524,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_single_prime( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_prime( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_single_prime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_single_prime() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word 99' word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,11 +557,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_contractions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_contractions( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_contractions( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_contractions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_contractions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word word's word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,11 +598,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_opening_quote( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_opening_quote( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_opening_quote() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_opening_quote() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word "word word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,11 +675,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_closing_quote( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_closing_quote( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_closing_quote() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_closing_quote() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word word" word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,11 +764,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_closing_single_quote( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_closing_single_quote( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_closing_single_quote() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_closing_single_quote() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word word' word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -854,11 +854,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30445
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_multiplication
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiplication( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiplication( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_multiplication() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_multiplication() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '9x9',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,11 +904,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_ampersand
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ampersand( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ampersand( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_ampersand() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ampersand() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word & word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,11 +969,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_cockney
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_cockney( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cockney( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_cockney() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_cockney() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word 'tain't word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,11 +1030,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_smart_dashes( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_smart_dashes( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_smart_dashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_smart_dashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word --- word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1083,11 +1083,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_misc_static_replacements( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_misc_static_replacements( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_misc_static_replacements() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_misc_static_replacements() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word ... word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1138,11 +1138,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8775
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_quoted_numbers( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_quoted_numbers( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_quoted_numbers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_quoted_numbers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word "42.00" word',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,11 +1189,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20342
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_quotes_and_dashes( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_quotes_and_dashes( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_quotes_and_dashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_quotes_and_dashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'word---"quote"',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1252,11 +1252,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12690
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_avoidance( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_avoidance( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_tag_avoidance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_tag_avoidance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '[ ... ]',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1475,11 +1475,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26850
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_year_abbr( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_year_abbr( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_year_abbr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_year_abbr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word '99 word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1564,7 +1564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27426
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_translate
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_translate( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translate( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gettext_with_context', array( $this, 'filter_translate' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wptexturize( $input, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1575,7 +1575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, $result );
</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">- function filter_translate( $translations, $text, $context, $domain ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_translate( $translations, $text, $context, $domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case '–':
</span><span class="cx" style="display: block; padding: 0 10px"> return '!endash!';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1604,7 +1604,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">- function data_translate() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_translate() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "word '99 word",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1791,11 +1791,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28483
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_element_stack( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_element_stack( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_element_stack() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_element_stack() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<span>hello</code>---</span>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1842,7 +1842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29557
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_unregistered_shortcodes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unregistered_shortcodes( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unregistered_shortcodes( $input, $output ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $output = $this->assertSame( $output, wptexturize( $input ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1851,12 +1851,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $output;
</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">- function filter_shortcodes( $disabled ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_shortcodes( $disabled ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $disabled[] = 'audio';
</span><span class="cx" style="display: block; padding: 0 10px"> return $disabled;
</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">- function data_unregistered_shortcodes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_unregistered_shortcodes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '[a]a--b[audio]---[/audio]a--b[/a]',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1927,11 +1927,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29256
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_primes_vs_quotes( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_primes_vs_quotes( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wptexturize( $input ) );
</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">- function data_primes_vs_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_primes_vs_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "George's porch is 99' long.",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1989,7 +1989,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29256
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_primes_quotes_translation
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_primes_quotes_translation( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_primes_quotes_translation( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gettext_with_context', array( $this, 'filter_translate2' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wptexturize( $input, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2000,7 +2000,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, $result );
</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">- function filter_translate2( $translations, $text, $context, $domain ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_translate2( $translations, $text, $context, $domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case '–':
</span><span class="cx" style="display: block; padding: 0 10px"> return '!endash!';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2027,7 +2027,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">- function data_primes_quotes_translation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_primes_quotes_translation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "George's porch is 99' long.",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2082,7 +2082,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_whole_posts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pcre_performance( $input ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pcre_performance( $input ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // With shortcodes disabled.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2102,11 +2102,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35864
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trailing_less_than() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trailing_less_than() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'F–oo<', wptexturize( 'F--oo<', 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">- function data_whole_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_whole_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/formatting/whole-posts.php';
</span><span class="cx" style="display: block; padding: 0 10px"> return data_whole_posts();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/wpTrimWords.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,22 +14,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private $long_text = '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 mollis viverra. Pellentesque id urna euismod dolor cursus sagittis.';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trims_to_55_by_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_to_55_by_default() {
</ins><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…';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $trimmed, wp_trim_words( $this->long_text ) );
</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">- function test_trims_to_10() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_to_10() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $trimmed = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce varius…';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $trimmed, wp_trim_words( $this->long_text, 10 ) );
</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">- function test_trims_to_5_and_uses_custom_more() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_to_5_and_uses_custom_more() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $trimmed = 'Lorem ipsum dolor sit amet,[...] Read on!';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $trimmed, wp_trim_words( $this->long_text, 5, '[...] Read on!' ) );
</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">- function test_strips_tags_before_trimming() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_tags_before_trimming() {
</ins><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…';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $trimmed, wp_trim_words( $text, 5 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18726
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strips_script_and_style_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strips_script_and_style_content() {
</ins><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><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"> $this->assertSame( $trimmed, wp_trim_words( $text ) );
</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">- function test_doesnt_trim_short_text() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_doesnt_trim_short_text() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = 'This is some short text.';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $text, wp_trim_words( $text ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trims_to_20_counted_by_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_to_20_counted_by_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = substr( $this->long_text, 0, 20 ) . '…';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_trim_words( $this->long_text, 20 );
</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"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trims_to_20_counted_by_chars_with_double_width_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trims_to_20_counted_by_chars_with_double_width_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = str_repeat( 'あ', 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = str_repeat( 'あ', 19 ) . '…';
</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"> * @ticket 47867
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_works_with_non_numeric_num_words() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_works_with_non_numeric_num_words() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', wp_trim_words( $this->long_text, '', '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', wp_trim_words( $this->long_text, 'abc', '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', wp_trim_words( $this->long_text, null, '' ) );
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/formatting/zeroise.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,11 +4,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group formatting
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pads_with_leading_zeroes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pads_with_leading_zeroes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '00005', zeroise( 5, 5 ) );
</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">- function test_does_nothing_if_input_is_already_longer() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_does_nothing_if_input_is_already_longer() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '5000000', zeroise( 5000000, 2 ) );
</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="trunktestsphpunittestsfunctionsaddMagicQuotesphp"></a>
<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/addMagicQuotes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/addMagicQuotes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/addMagicQuotes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param array $test_array Test value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected Expected return 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">- function test_add_magic_quotes( $test_array, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_magic_quotes( $test_array, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, add_magic_quotes( $test_array ) );
</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="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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/allowedProtocols.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19354
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_is_not_an_allowed_protocol() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_is_not_an_allowed_protocol() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( 'data', wp_allowed_protocols() );
</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">- function test_allowed_protocol_has_an_example() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allowed_protocol_has_an_example() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $example_protocols = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->data_example_urls() as $example ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $example_protocols[] = $example[0];
</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"> * @param string The scheme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string Example 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">- function test_allowed_protocols( $protocol, $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allowed_protocols( $protocol, $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $url, esc_url( $url, $protocol ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $url, esc_url( $url, wp_allowed_protocols() ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @link http://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_example_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_example_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'http', 'http://example.com' ), // RFC7230
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'https', 'https://example.com' ), // RFC7230
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/canonicalCharset.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @covers ::get_option
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_option_blog_charset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_option_blog_charset() {
</ins><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></span></pre></div>
<a id="trunktestsphpunittestsfunctionspluginBasenamephp"></a>
<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/pluginBasename.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/pluginBasename.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/pluginBasename.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 29154
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_return_correct_basename_for_symlinked_plugins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_return_correct_basename_for_symlinked_plugins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_plugin_paths;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_plugin_paths = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28441
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_return_correct_basename_for_symlinked_plugins_with_path_conflicts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_return_correct_basename_for_symlinked_plugins_with_path_conflicts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_plugin_paths;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_plugin_paths = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpAuthCheckphp"></a>
<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/wpAuthCheck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpAuthCheck.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/wpAuthCheck.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 41860
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_auth_check_user_not_logged_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_auth_check_user_not_logged_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-auth-check' => false,
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 41860
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_auth_check_user_logged_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_auth_check_user_logged_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Log user in.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( 1 );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 41860
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_auth_check_user_logged_in_login_grace_period_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_auth_check_user_logged_in_login_grace_period_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Log user in.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/wpGetArchives.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected $month_url;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $year_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->month_url = get_month_link( gmdate( 'Y' ), gmdate( 'm' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,12 +26,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_archives_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['default'] = "<li><a href='" . $this->month_url . "'>" . gmdate( 'F Y' ) . '</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected['default'], trim( wp_get_archives( array( 'echo' => false ) ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_archives_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['type'] = "<li><a href='" . $this->year_url . "'>" . gmdate( 'Y' ) . '</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['type'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_archives_limit() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_limit() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ids = array_slice( array_reverse( self::$post_ids ), 0, 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link1 = get_permalink( $ids[0] );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_archives_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['format'] = "<option value='" . $this->month_url . "'> " . gmdate( 'F Y' ) . ' </option>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['format'],
</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">- function test_wp_get_archives_before_and_after() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_before_and_after() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['before_and_after'],
</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"> );
</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">- function test_wp_get_archives_show_post_count() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_show_post_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['show_post_count'] = "<li><a href='" . $this->month_url . "'>" . gmdate( 'F Y' ) . '</a> (8)</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['show_post_count'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,13 +129,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_archives_echo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_echo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['echo'] = "\t<li><a href='" . $this->month_url . "'>" . gmdate( 'F Y' ) . '</a></li>' . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected['echo'] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives( array( 'echo' => 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">- function test_wp_get_archives_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_order() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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"> * @ticket 21596
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_archives_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_archives_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'taco', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpValidateBooleanphp"></a>
<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/wpValidateBoolean.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpValidateBoolean.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions/wpValidateBoolean.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function data_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $std = new \stdClass();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/functions.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group functions.php
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_args_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_args_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $x = new MockClass;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), wp_parse_args( $y ) );
</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">- function test_wp_parse_args_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_args_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Arrays.
</span><span class="cx" style="display: block; padding: 0 10px"> $a = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), wp_parse_args( $a ) );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_args_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_args_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $x = new MockClass;
</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="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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_args_other() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_args_other() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $s, wp_parse_args( $b ) );
</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"> * @ticket 30753
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_args_boolean_strings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_args_boolean_strings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( 'foo=false&bar=true' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $args['foo'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $args['bar'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,13 +87,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35972
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bool_from_yn() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bool_from_yn() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bool_from_yn( 'Y' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bool_from_yn( 'y' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( bool_from_yn( 'n' ) );
</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">- function test_path_is_absolute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_path_is_absolute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $absolute_paths = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '/',
</span><span class="cx" style="display: block; padding: 0 10px"> '/foo/',
</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"> }
</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">- function test_path_is_not_absolute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_path_is_not_absolute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $relative_paths = array(
</span><span class="cx" style="display: block; padding: 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,11 +135,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_normalize_path( $path, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_normalize_path( $path, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_normalize_path( $path ) );
</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">- function data_wp_normalize_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_normalize_path() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Windows paths.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'C:\\www\\path\\', 'C:/www/path/' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,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">- function test_wp_unique_filename() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_unique_filename() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</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><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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42437
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unique_filename_with_dimension_like_filename() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_filename_with_dimension_like_filename() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $testdir = DIR_TESTDATA . '/images/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Callback to patch "basedir" when used in `wp_unique_filename()`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function upload_dir_patch_basedir( $upload_dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function upload_dir_patch_basedir( $upload_dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $upload_dir['basedir'] = DIR_TESTDATA . '/images/';
</span><span class="cx" style="display: block; padding: 0 10px"> return $upload_dir;
</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"> * @ticket 53668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_unique_filename_with_additional_image_extension() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_unique_filename_with_additional_image_extension() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $testdir = DIR_TESTDATA . '/images/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );
</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"> * @dataProvider data_is_not_serialized
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_maybe_serialize( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_maybe_serialize( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $value ) || is_object( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = serialize( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_serialized
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_maybe_serialize_with_double_serialization( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_maybe_serialize_with_double_serialization( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = serialize( $value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, maybe_serialize( $value ) );
</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"> * @dataProvider data_is_serialized
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_not_serialized
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_maybe_unserialize( $value, $is_serialized ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_maybe_unserialize( $value, $is_serialized ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $is_serialized ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = unserialize( trim( $value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> * @dataProvider data_is_serialized
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_not_serialized
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_serialized( $value, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_serialized( $value, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, is_serialized( $value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_serialize_deserialize_objects
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_deserialize_request_utility_filtered_iterator_objects( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_deserialize_request_utility_filtered_iterator_objects( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $serialized = maybe_serialize( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_class( $value ) === 'Requests_Utility_FilteredIterator' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_value = unserialize( $serialized );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,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">- function data_serialize_deserialize_objects() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_serialize_deserialize_objects() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( new Requests_Utility_FilteredIterator( array( 1 ), 'md5' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( new Requests_Utility_FilteredIterator( array( 1, 2 ), 'sha1' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +383,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">- function data_is_serialized() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_is_serialized() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( serialize( null ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( serialize( true ), true ),
</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"> );
</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">- function data_is_not_serialized() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_is_not_serialized() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( null, false ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( true, false ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,11 +439,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46570
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_serialized_should_return_true_for_large_floats
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_serialized_should_return_true_for_large_floats( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_serialized_should_return_true_for_large_floats( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_serialized( $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">- function data_is_serialized_should_return_true_for_large_floats() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_is_serialized_should_return_true_for_large_floats() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( serialize( 1.7976931348623157E+308 ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( serialize( array( 1.7976931348623157E+308, 1.23e50 ) ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17375
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_new_serializable_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_new_serializable_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_serialized( 'C:16:"Serialized_Class":6:{a:0:{}}' ) );
</span><span class="cx" style="display: block; padding: 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"> * @group add_query_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">- function test_add_query_arg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_query_arg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_req_uri = $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $urls = array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31306
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_query_arg_numeric_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_query_arg_numeric_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array( 'foo' => 'bar' ), '1=1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '1=1&foo=bar', $url );
</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"> * @ticket 21594
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_allowed_mime_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_allowed_mime_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mimes = get_allowed_mime_types();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $mimes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,7 +688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21594
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_mime_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_mime_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mimes = wp_get_mime_types();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $mimes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,7 +720,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_canonical_charset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_canonical_charset() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,11 +758,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43977
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_parse_list
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_list( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_list( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, array_values( wp_parse_list( $actual ) ) );
</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">- function data_wp_parse_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_parse_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( '1', '2', '3', '4' ), '1,2,3,4' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 'apple', 'banana', 'carrot', 'dog' ), 'apple,banana,carrot,dog' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,11 +781,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_parse_id_list
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_id_list( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_id_list( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, array_values( wp_parse_id_list( $actual ) ) );
</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">- function data_wp_parse_id_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_parse_id_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 1, 2, 3, 4 ), '1,2,3,4' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 1, 2, 3, 4 ), '1, 2,,3,4' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,11 +800,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_parse_slug_list
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_parse_slug_list( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_slug_list( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, array_values( wp_parse_slug_list( $actual ) ) );
</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">- function data_wp_parse_slug_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_parse_slug_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 'apple', 'banana', 'carrot', 'dog' ), 'apple,banana,carrot,dog' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 'apple', 'banana', 'carrot', 'dog' ), 'apple, banana,,carrot,dog' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,7 +816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_device_can_upload
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_device_can_upload( $user_agent, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_device_can_upload( $user_agent, $expected ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,7 +823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function data_device_can_upload() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_device_can_upload() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // iPhone iOS 5.0.1, Safari 5.1.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -876,7 +876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9064
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_extract_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_extract_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_urls = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://woo.com/1,2,3,4,5,6/-1-2-3-4-/woo.html',
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://this.com',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,7 +1043,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_json_encode( 'a' ), '"a"' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,7 +1050,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode_utf8() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode_utf8() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_json_encode( '这' ), '"\u8fd9"' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function mb_detect_order
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode_non_utf8() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode_non_utf8() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $charsets = mb_detect_order();
</span><span class="cx" style="display: block; padding: 0 10px"> $old_charsets = $charsets;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( 'EUC-JP', $charsets, true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,7 +1080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function mb_detect_order
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode_non_utf8_in_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode_non_utf8_in_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $charsets = mb_detect_order();
</span><span class="cx" style="display: block; padding: 0 10px"> $old_charsets = $charsets;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( 'EUC-JP', $charsets, true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1101,7 +1101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_json_encode( array( 'a' ) ), '["a"]' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1108,7 +1108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode_object() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_json_encode( $object ), '{"a":"b"}' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,7 +1117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_encode_depth() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_encode_depth() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array( array( array( 1, 2, 3 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $json = wp_json_encode( $data, 0, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $json );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1130,7 +1130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53238
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_file_decode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_file_decode() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_json_file_decode(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/blocks/notice/block.json'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1142,7 +1142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53238
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_json_file_decode_associative_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_json_file_decode_associative_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_json_file_decode(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/blocks/notice/block.json',
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'associative' => true )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,7 +1156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36054
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider datetime_provider
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mysql_to_rfc3339( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mysql_to_rfc3339( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date_return = mysql_to_rfc3339( $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $date_return, 'The date return must be a string' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1165,7 +1165,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function datetime_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function datetime_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '2016-03-15T18:54:46', '15-03-2016 18:54:46' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '2016-03-02T19:13:25', '2016-03-02 19:13:25' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1218,7 +1218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32075
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_raise_memory_limit() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_raise_memory_limit() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( -1 !== WP_MAX_MEMORY_LIMIT ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'WP_MAX_MEMORY_LIMIT should be set to -1.' );
</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"> * @covers ::wp_generate_uuid4
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38164
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_generate_uuid4() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_generate_uuid4() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 20; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1256,7 +1256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_is_uuid
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39778
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_is_valid_uuid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_is_valid_uuid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuids_v4 = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '27fe2421-780c-44c5-b39b-fff753092b55',
</span><span class="cx" style="display: block; padding: 0 10px"> 'b7c7713a-4ee9-45a1-87ed-944a90390fc7',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1306,7 +1306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_unique_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_unique_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_unique_id() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test without 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">@@ -1330,7 +1330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40017
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _wp_get_image_mime
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider wp_get_image_mime
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_get_image_mime( $file, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1365,10 +1365,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"> * @ticket 39550
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _wp_check_filetype_and_ext_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider wp_check_filetype_and_ext_data
</ins><span class="cx" style="display: block; padding: 0 10px"> * @requires extension fileinfo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1377,7 +1377,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension fileinfo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_check_filetype_and_ext_with_filtered_svg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_check_filetype_and_ext_with_filtered_svg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/video-play.svg';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'video-play.svg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1387,11 +1387,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'proper_filename' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_mimes', array( $this, '_filter_mime_types_svg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'upload_mimes', array( $this, '_test_add_mime_types_svg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1399,7 +1399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension fileinfo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_check_filetype_and_ext_with_filtered_woff() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_check_filetype_and_ext_with_filtered_woff() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1409,19 +1409,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'proper_filename' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_mimes', array( $this, '_filter_mime_types_woff' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'upload_mimes', array( $this, '_test_add_mime_types_woff' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _filter_mime_types_svg( $mimes ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_mime_types_svg( $mimes ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mimes['svg'] = 'image/svg+xml';
</span><span class="cx" style="display: block; padding: 0 10px"> return $mimes;
</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">- public function _filter_mime_types_woff( $mimes ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_mime_types_woff( $mimes ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mimes['woff'] = 'application/font-woff';
</span><span class="cx" style="display: block; padding: 0 10px"> return $mimes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1429,7 +1429,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Data provider for test_wp_get_image_mime().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _wp_get_image_mime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_get_image_mime() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Standard JPEG.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1584,7 +1584,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _wp_check_filetype_and_ext_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_check_filetype_and_ext_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Standard image.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/general/paginateLinks.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,13 +9,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private $i18n_count = 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_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">- function test_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page2 = get_pagenum_link( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $page3 = get_pagenum_link( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $page50 = get_pagenum_link( 50 );
</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"> $this->assertSameIgnoreEOL( $expected, $links );
</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">- function test_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page2 = home_url( '/page/2/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $page3 = home_url( '/page/3/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $page50 = home_url( '/page/50/' );
</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"> $this->assertSameIgnoreEOL( $expected, $links );
</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">- function test_prev_next_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prev_next_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $home = home_url( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $page3 = get_pagenum_link( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $page4 = get_pagenum_link( 4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameIgnoreEOL( $expected, $links );
</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">- function test_prev_next_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prev_next_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $home = home_url( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $page3 = get_pagenum_link( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $page4 = get_pagenum_link( 4 );
</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"> $this->assertSameIgnoreEOL( $expected, $links );
</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">- function increment_i18n_count() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function increment_i18n_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->i18n_count += 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">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25735
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paginate_links_number_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paginate_links_number_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->i18n_count = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'number_format_i18n', array( $this, 'increment_i18n_count' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> paginate_links(
</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"> * @ticket 24606
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paginate_links_base_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paginate_links_base_value() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Current page: 2.
</span><span class="cx" style="display: block; padding: 0 10px"> $links = paginate_links(
</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"> $this->assertSame( get_pagenum_link( 2 ), $href );
</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">- function add_query_arg( $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_query_arg( $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29636
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paginate_links_query_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paginate_links_query_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_pagenum_link', array( $this, 'add_query_arg' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $links = paginate_links(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30831
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paginate_links_with_custom_query_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paginate_links_with_custom_query_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_pagenum_link', array( $this, 'add_query_arg' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $links = paginate_links(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/general/template.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,16 +17,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $custom_logo_id;
</span><span class="cx" style="display: block; padding: 0 10px"> public $custom_logo_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_site_icon = new WP_Site_Icon();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_remove_custom_logo();
- $this->_remove_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->remove_custom_logo();
+ $this->remove_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,13 +37,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_site_icon_url
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_site_icon_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_icon_url() {
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->site_icon_url, get_site_icon_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->_remove_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->remove_site_icon();
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,11 +52,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::site_icon_url
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_site_icon_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_site_icon_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> site_icon_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->_set_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $this->site_icon_url );
</span><span class="cx" style="display: block; padding: 0 10px"> site_icon_url();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,13 +66,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_site_icon() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_site_icon() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_site_icon() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_site_icon() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_remove_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->remove_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_site_icon() );
</span><span class="cx" style="display: block; padding: 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,10 +82,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_site_icon_returns_true_when_called_for_other_site_with_site_icon_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_site_icon_returns_true_when_called_for_other_site_with_site_icon_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_site_icon();
</ins><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"> $this->assertTrue( has_site_icon( $blog_id ) );
</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"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_site_icon_returns_false_when_called_for_other_site_without_site_icon_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_site_icon_returns_false_when_called_for_other_site_without_site_icon_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_site_icon( $blog_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,11 +108,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_site_icon() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_site_icon() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_site_icon();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = array(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,11 +131,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_site_icon_with_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_site_icon_with_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_site_icon();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_site_icon();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_site_icon();
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = array(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,9 +147,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output = implode( "\n", $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $output );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'site_icon_meta_tags', array( $this, '_custom_site_icon_meta_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'site_icon_meta_tags', array( $this, 'custom_site_icon_meta_tag' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_site_icon();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'site_icon_meta_tags', array( $this, '_custom_site_icon_meta_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'site_icon_meta_tags', array( $this, 'custom_site_icon_meta_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"> /**
</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"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_preview_wp_site_icon_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_wp_site_icon_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_customize_preview_wp_site_icon_dirty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_customize_preview_wp_site_icon_dirty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
</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"> $wp_customize->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->start_previewing_theme();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->_insert_attachment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = $this->insert_attachment();
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->set_post_value( 'site_icon', $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->get_setting( 'site_icon' )->preview();
</span><span class="cx" style="display: block; padding: 0 10px"> $output = array(
</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"> * @param $meta_tags
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function _custom_site_icon_meta_tag( $meta_tags ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function custom_site_icon_meta_tag( $meta_tags ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_tags[] = sprintf( '<link rel="apple-touch-icon" sizes="150x150" href="%s" />', esc_url( get_site_icon_url( 150 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $meta_tags;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,10 +218,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.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">- function _set_site_icon() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function set_site_icon() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->site_icon_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'intermediate_image_sizes_advanced', array( $this->wp_site_icon, 'additional_sizes' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_insert_attachment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->insert_attachment();
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'intermediate_image_sizes_advanced', array( $this->wp_site_icon, 'additional_sizes' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.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">- function _remove_site_icon() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function remove_site_icon() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'site_icon' );
</span><span class="cx" style="display: block; padding: 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"> * @since 4.3.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">- function _insert_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function insert_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = DIR_TESTDATA . '/images/test-image.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = file_get_contents( $filename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,13 +260,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.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">- function test_has_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_custom_logo() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_custom_logo() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_remove_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->remove_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_custom_logo() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,10 +276,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_custom_logo_returns_true_when_called_for_other_site_with_custom_logo_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_custom_logo_returns_true_when_called_for_other_site_with_custom_logo_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_custom_logo();
</ins><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"> $this->assertTrue( has_custom_logo( $blog_id ) );
</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"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_custom_logo_returns_false_when_called_for_other_site_without_custom_logo_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_custom_logo_returns_false_when_called_for_other_site_without_custom_logo_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_custom_logo( $blog_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,15 +303,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.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">- function test_get_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_custom_logo() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px"> $custom_logo = get_custom_logo();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $custom_logo );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $custom_logo );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_remove_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->remove_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_custom_logo() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,11 +321,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_custom_logo_returns_logo_when_called_for_other_site_with_custom_logo_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_logo_returns_logo_when_called_for_other_site_with_custom_logo_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_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->_set_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_logo_attr = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'custom-logo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,11 +352,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.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">- function test_the_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_custom_logo();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_logo_attr = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'custom-logo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,8 +380,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::the_custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_custom_logo_with_alt() {
- $this->_set_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_custom_logo_with_alt() {
+ $this->set_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image_alt = 'My alt attribute';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,9 +406,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.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">- function _set_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function set_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->custom_logo_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_insert_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->insert_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'custom_logo', $this->custom_logo_id );
</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"> * @since 4.5.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">- function _remove_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function remove_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_mod( 'custom_logo' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.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">- function _insert_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function insert_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = DIR_TESTDATA . '/images/test-image.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = file_get_contents( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_site_icon_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">- function test_get_site_icon_url_preserves_switched_state() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_icon_url_preserves_switched_state() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_custom_logo_preserves_switched_state() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_custom_logo_preserves_switched_state() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_custom_logo_preserves_switched_state() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_logo_preserves_switched_state() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +504,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_header
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_header_returns_nothing_on_success() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_returns_nothing_on_success() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputRegex( '/Header/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The `get_header()` function must not return anything
</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"> * @covers ::get_footer
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_footer_returns_nothing_on_success() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_footer_returns_nothing_on_success() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputRegex( '/Footer/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The `get_footer()` function must not return anything
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_sidebar_returns_nothing_on_success() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_sidebar_returns_nothing_on_success() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputRegex( '/Sidebar/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The `get_sidebar()` function must not return anything
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_template_part
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_template_part_returns_nothing_on_success() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_template_part_returns_nothing_on_success() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputRegex( '/Template Part/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The `get_template_part()` function must not return anything
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +556,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_template_part
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_template_part_returns_false_on_failure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_template_part_returns_false_on_failure() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_template_part( 'non-existing-template' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,7 +565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_template_part
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_template_part_passes_arguments_to_template() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_template_part_passes_arguments_to_template() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputRegex( '/{"foo":"baz"}/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_template_part( 'template', 'part', array( 'foo' => 'baz' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_the_archive_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">- function test_get_the_archive_title_is_correct_for_author_queries() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_archive_title_is_correct_for_author_queries() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_with_posts = $this->factory()->user->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralwpGetArchivesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/wpGetArchives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpGetArchives.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/general/wpGetArchives.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @covers ::wp_get_archives
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_General_wpGetArchives extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'posts' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23206
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_archives_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_archives_cache() {
</ins><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"> self::factory()->post->create_many( 3, array( 'post_type' => 'post' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralwpGetDocumentTitlephp"></a>
<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/wpGetDocumentTitle.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'after_setup_theme', array( $this, '_add_title_tag_support' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'after_setup_theme', array( $this, 'add_title_tag_support' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->blog_name = get_option( 'blogname' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,11 +53,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( get_post( 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">- function _add_title_tag_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_title_tag_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'title-tag' );
</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">- function test__wp_render_title_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__wp_render_title_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( sprintf( "<title>%s – %s</title>\n", $this->blog_name, get_option( 'blogdescription' ) ) );
</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"> _wp_render_title_tag();
</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">- function test__wp_render_title_no_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__wp_render_title_no_theme_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'title-tag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,19 +73,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_render_title_tag();
</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">- function test_short_circuiting_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_short_circuiting_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_get_document_title', array( $this, '_short_circuit_title' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_document_title', array( $this, 'short_circuit_title' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'A Wild Title', wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _short_circuit_title( $title ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function short_circuit_title( $title ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'A Wild Title';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_front_page_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_front_page_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_on_front',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,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">- add_filter( 'document_title_parts', array( $this, '_front_page_title_parts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_parts', array( $this, 'front_page_title_parts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( '%s – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( '%s – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _front_page_title_parts( $parts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function front_page_title_parts( $parts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'tagline', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'site', $parts );
</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"> return $parts;
</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">- function test_home_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_home_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_page_id = $this->factory->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'blog-page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,15 +130,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'blog-page – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paged_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paged_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?page=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">- add_filter( 'document_title_parts', array( $this, '_paged_title_parts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_parts', array( $this, 'paged_title_parts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( '%s – Page 4 – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _paged_title_parts( $parts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function paged_title_parts( $parts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'page', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'tagline', $parts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,15 +147,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $parts;
</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">- function test_singular_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_singular_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?p=' . self::$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">- add_filter( 'document_title_parts', array( $this, '_singular_title_parts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_parts', array( $this, 'singular_title_parts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'test_title – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _singular_title_parts( $parts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function singular_title_parts( $parts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'site', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'tagline', $parts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,25 +163,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $parts;
</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">- function test_category_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'test_category – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'Search Results for “test_title” – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_author_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'test_author – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_type_archive_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_archive_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpt',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,39 +204,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'test_cpt – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_year_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_year_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( '2015 – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_month_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_month_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'September 2015 – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_day_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_day_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'September 22, 2015 – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_404_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_404_title() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'Page not found – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paged_post_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paged_post_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?paged=4&p=' . self::$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">- add_filter( 'title_tag_parts', array( $this, '_paged_post_title_parts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'title_tag_parts', array( $this, 'paged_post_title_parts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'test_title – Page 4 – %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _paged_post_title_parts( $parts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function paged_post_title_parts( $parts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'page', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'site', $parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $parts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,15 +245,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $parts;
</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">- function test_rearrange_title_parts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rearrange_title_parts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?p=' . self::$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">- add_filter( 'document_title_parts', array( $this, '_rearrange_title_parts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_parts', array( $this, 'rearrange_title_parts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( '%s – test_title', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _rearrange_title_parts( $parts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function rearrange_title_parts( $parts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> $parts['site'],
</span><span class="cx" style="display: block; padding: 0 10px"> $parts['title'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,15 +262,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $parts;
</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">- function test_change_title_separator() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_change_title_separator() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?p=' . self::$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">- add_filter( 'document_title_separator', array( $this, '_change_title_separator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_separator', array( $this, 'change_title_separator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'test_title %%%% %s', $this->blog_name ), wp_get_document_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _change_title_separator( $sep ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function change_title_separator( $sep ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '%%';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralwpResourceHintsphp"></a>
<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/wpResourceHints.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpResourceHints.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/general/wpResourceHints.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> private $old_wp_scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> private $old_wp_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->old_wp_styles = isset( $GLOBALS['wp_styles'] ) ? $GLOBALS['wp_styles'] : null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,13 +24,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_styles']->default_version = get_bloginfo( 'version' );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_scripts'] = $this->old_wp_scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_styles'] = $this->old_wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_should_have_defaults_on_frontend() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_have_defaults_on_frontend() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,22 +38,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_resource_hints();
</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">- function test_dns_prefetching() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dns_prefetching() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='dns-prefetch' href='//wordpress.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='dns-prefetch' href='//google.com' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='dns-prefetch' href='//make.wordpress.org' />\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">- add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_domains' ), 10, 2 );
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_domains' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _add_dns_prefetch_domains( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_dns_prefetch_domains( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'dns-prefetch' === $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'http://wordpress.org';
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'https://wordpress.org';
</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"> * @ticket 37652
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_preconnect() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_preconnect() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='preconnect' href='//wordpress.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='preconnect' href='https://make.wordpress.org' />\n" .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,16 +76,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='preconnect' href='http://google.com' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='preconnect' href='http://w.org' />\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">- add_filter( 'wp_resource_hints', array( $this, '_add_preconnect_domains' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_preconnect_domains' ), 10, 2 );
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_resource_hints', array( $this, '_add_preconnect_domains' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_preconnect_domains' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _add_preconnect_domains( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_preconnect_domains( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'preconnect' === $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = '//wordpress.org';
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'https://make.wordpress.org';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,22 +97,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $hints;
</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">- function test_prerender() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prerender() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='prerender' href='https://make.wordpress.org/great-again' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='prerender' href='http://jobs.wordpress.net' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='prerender' href='//core.trac.wordpress.org' />\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">- add_filter( 'wp_resource_hints', array( $this, '_add_prerender_urls' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_prerender_urls' ), 10, 2 );
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_resource_hints', array( $this, '_add_prerender_urls' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_prerender_urls' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _add_prerender_urls( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_prerender_urls( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'prerender' === $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'https://make.wordpress.org/great-again';
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'http://jobs.wordpress.net';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,20 +123,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $hints;
</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">- function test_parse_url_dns_prefetch() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_url_dns_prefetch() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='dns-prefetch' href='//make.wordpress.org' />\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">- add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_long_urls' ), 10, 2 );
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_long_urls' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _add_dns_prefetch_long_urls( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_dns_prefetch_long_urls( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'dns-prefetch' === $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'http://make.wordpress.org/wp-includes/css/editor.css';
</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"> return $hints;
</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">- function test_dns_prefetch_styles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dns_prefetch_styles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='dns-prefetch' href='//s.w.org' />\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,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">- function test_dns_prefetch_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dns_prefetch_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='dns-prefetch' href='//s.w.org' />\n";
</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"> * @ticket 37385
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dns_prefetch_scripts_does_not_include_registered_only() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dns_prefetch_scripts_does_not_include_registered_only() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $unexpected = "<link rel='dns-prefetch' href='//wordpress.org' />\n";
</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"> * @ticket 37502
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_deregistered_scripts_are_ignored() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_deregistered_scripts_are_ignored() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-script', 'http://example.org/script.js' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,23 +214,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37652
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_malformed_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_malformed_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Errant colon.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_malformed_url_errant_colon' ), 10, 2 );
</ins><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">- remove_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_malformed_url_errant_colon' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unsupported Scheme.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_unsupported_scheme' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_malformed_url_unsupported_scheme' ), 10, 2 );
</ins><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">- remove_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_unsupported_scheme' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_malformed_url_unsupported_scheme' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _add_malformed_url_errant_colon( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_malformed_url_errant_colon( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'preconnect' === $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = '://core.trac.wordpress.org/ticket/37652';
</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"> return $hints;
</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">- function _add_malformed_url_unsupported_scheme( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_malformed_url_unsupported_scheme( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'preconnect' === $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = 'git://develop.git.wordpress.org/';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_custom_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link rel='preconnect' href='https://make.wordpress.org' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link crossorigin as='image' pr='0.5' href='https://example.com/foo.jpeg' rel='prefetch' />\n" .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,16 +256,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "<link crossorigin='use-credentials' as='style' href='https://example.com/foo.css' rel='prefetch' />\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> "<link href='http://wordpress.org' rel='prerender' />\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">- add_filter( 'wp_resource_hints', array( $this, '_add_url_with_attributes' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_resource_hints', array( $this, 'add_url_with_attributes' ), 10, 2 );
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_resource_hints', array( $this, '_add_url_with_attributes' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_resource_hints', array( $this, 'add_url_with_attributes' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _add_url_with_attributes( $hints, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_url_with_attributes( $hints, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Ignore hints with missing href attributes.
</span><span class="cx" style="display: block; padding: 0 10px"> $hints[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rel' => 'foo',
</span></span></pre></div>
<a id="trunktestsphpunittestshttpbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/http/base.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> protected $http_request_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'WP_Http_' . ucfirst( $this->transport );
</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">- function filter_http_request_args( array $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_http_request_args( array $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->http_request_args = $args;
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirect_on_301() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirect_on_301() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 5 : 5 & 301.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?code=301&rt=' . 5, array( 'redirection' => 5 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirect_on_302() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirect_on_302() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 5 : 5 & 302.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 5, array( 'redirection' => 5 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirect_on_301_no_redirect() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirect_on_301_no_redirect() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 5 > 0 & 301.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?code=301&rt=' . 5, array( 'redirection' => 0 ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirect_on_302_no_redirect() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirect_on_302_no_redirect() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 5 > 0 & 302.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 5, array( 'redirection' => 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirections_equal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirections_equal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 5 - 5.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?rt=' . 5, array( 'redirection' => 5 ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_head_redirections() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_head_redirections() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No redirections on HEAD request.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 1, array( 'method' => 'HEAD' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirect_on_head() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirect_on_head() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Redirections on HEAD request when Requested.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->redirection_script . '?rt=' . 5,
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirections_greater() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirections_greater() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 10 > 5.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?rt=' . 10, array( 'redirection' => 5 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirections_greater_edgecase() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirections_greater_edgecase() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 6 > 5 (close edge case).
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?rt=' . 6, array( 'redirection' => 5 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirections_less_edgecase() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirections_less_edgecase() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 4 < 5 (close edge case).
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?rt=' . 4, array( 'redirection' => 5 ) );
</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"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_redirections_zero_redirections_specified() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_redirections_zero_redirections_specified() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 0 redirections asked for, should return the document?
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?code=302&rt=' . 5, array( 'redirection' => 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_location_header_on_201() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_location_header_on_201() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prints PASS on initial load, FAIL if the client follows the specified redirection.
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request( $this->redirection_script . '?201-location=true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_redirection_on_PUT() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_redirection_on_PUT() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?201-location=1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test 301 - POST to POST.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_send_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_send_headers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test that the headers sent are received by the server.
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test1' => 'test',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_file_stream() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_file_stream() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $this->file_stream_url;
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 153204;
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_file_stream_limited_size() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_file_stream_limited_size() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $this->file_stream_url;
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 10000;
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_request_limited_size() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_limited_size() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $this->file_stream_url;
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 10000;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_redirect_to_method_300( $response_code, $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_redirect_to_method_300( $response_code, $method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?post-redirect-to-method=1';
</span><span class="cx" style="display: block; padding: 0 10px">
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +393,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_get
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ip_url_with_host_header() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ip_url_with_host_header() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ip = gethostbyname( 'api.wordpress.org' );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://' . $ip . '/core/tests/1.0/redirection.php?print-pass=1';
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_head
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_https_url_without_ssl_verification() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_https_url_without_ssl_verification() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://wordpress.org/';
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sslverify' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_get
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_location_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_location_headers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?multiple-location-headers=1';
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_get
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_cookie_handling() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cookie_handling() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?cookie-test=1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_get( $url );
</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"> * @covers ::wp_remote_get
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ssl() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ssl() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_http_supports( array( 'ssl' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'This installation of PHP does not support SSL.' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_request
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_url_with_double_slashes_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_with_double_slashes_path() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $this->redirection_script . '?rt=' . 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path = parse_url( $url, PHP_URL_PATH );
</span></span></pre></div>
<a id="trunktestsphpunittestshttpfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/http/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/functions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/http/functions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_head
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_head_request() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_head_request() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This URL gives a direct 200 response.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_head( $url );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_head
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_head_redirect() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_head_redirect() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This URL will 301 redirect.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_head( $url );
</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"> * @covers ::wp_remote_head
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_head_404() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_head_404() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_headers
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_response_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">- function test_get_request() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_request() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $url );
</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"> * @covers ::wp_remote_retrieve_headers
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_response_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">- function test_get_redirect() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_redirect() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This will redirect to asdftestblog1.files.wordpress.com.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_get
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_redirect_limit_exceeded() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_redirect_limit_exceeded() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This will redirect to asdftestblog1.files.wordpress.com.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers ::wp_remote_retrieve_cookie
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_cookie_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">- function test_get_response_cookies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_response_cookies() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://login.wordpress.org/wp-login.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_head( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_cookies
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_cookie
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_response_cookies_with_wp_http_cookie_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_response_cookies_with_wp_http_cookie_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://example.org';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</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"> * @covers ::wp_remote_retrieve_cookies
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_cookie
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_response_cookies_with_name_value_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_response_cookies_with_name_value_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://example.org';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_cookie
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Http
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_cookie_host_only() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_cookie_host_only() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Emulate WP_Http::request() internals.
</span><span class="cx" style="display: block; padding: 0 10px"> $requests_response = new Requests_Response();
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/http/http.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Http::make_absolute_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">- function test_make_absolute_url( $relative_url, $absolute_url, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_absolute_url( $relative_url, $absolute_url, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = WP_Http::make_absolute_url( $relative_url, $absolute_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function make_absolute_url_testcases() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function make_absolute_url_testcases() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 0: The Location header, 1: The current URL, 3: The expected URL.
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Absolute URL provided.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,12 +74,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_parse_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">- function test_wp_parse_url( $url, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_url( $url, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_parse_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function parse_url_testcases() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function parse_url_testcases() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 0: The URL, 1: The expected resulting structure.
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_parse_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">- function test_wp_parse_url_with_default_component() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_url_with_default_component() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_parse_url( self::FULL_TEST_URL, -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,12 +211,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_parse_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">- function test_wp_parse_url_with_component( $url, $component, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_parse_url_with_component( $url, $component, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_parse_url( $url, $component );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function parse_url_component_testcases() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function parse_url_component_testcases() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 0: The URL, 1: The requested component, 2: The expected resulting structure.
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( self::FULL_TEST_URL, PHP_URL_SCHEME, 'http' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,13 +328,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_parse_url
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_get_component_from_parsed_url_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">- function test_get_component_from_parsed_url_array( $url, $component, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_component_from_parsed_url_array( $url, $component, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parts = wp_parse_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = _get_component_from_parsed_url_array( $parts, $component );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function get_component_from_parsed_url_array_testcases() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_component_from_parsed_url_array_testcases() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 0: A URL, 1: PHP URL constant, 2: The expected result.
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,12 +369,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_wp_translate_php_url_constant_to_key
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_translate_php_url_constant_to_key( $input, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_translate_php_url_constant_to_key( $input, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = _wp_translate_php_url_constant_to_key( $input );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function wp_translate_php_url_constant_to_key_testcases() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_translate_php_url_constant_to_key_testcases() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 0: PHP URL constant, 1: The expected result.
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( PHP_URL_SCHEME, 'scheme' ),
</span></span></pre></div>
<a id="trunktestsphpunittestshttpwpRemoteRetrieveHeadersphp"></a>
<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/wpRemoteRetrieveHeaders.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/wpRemoteRetrieveHeaders.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/http/wpRemoteRetrieveHeaders.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Valid 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">- function test_remote_retrieve_headers_valid_response() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remote_retrieve_headers_valid_response() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = 'headers_data';
</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="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"> * Response is a WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remote_retrieve_headers_is_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remote_retrieve_headers_is_error() {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Response does not contain 'headers'
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remote_retrieve_headers_invalid_response() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remote_retrieve_headers_invalid_response() {
</ins><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></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 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/dimensions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group upload
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Image_Dimensions extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_400x400_no_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_400x400_no_crop() {
</ins><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 );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> $this->assertSame( array( 0, 0, 0, 0, 300, 400, 480, 640 ), $out );
</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">- function test_400x0_no_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_400x0_no_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 400w: 400x300.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 400, 0, false );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> $this->assertSame( array( 0, 0, 0, 0, 400, 533, 480, 640 ), $out );
</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">- function test_0x400_no_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_0x400_no_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 400h: 533x400.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 0, 400, false );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> $this->assertSame( array( 0, 0, 0, 0, 300, 400, 480, 640 ), $out );
</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">- function test_800x800_no_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_800x800_no_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 800x800.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 800, 800, false );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $out );
</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">- function test_800x0_no_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_800x0_no_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 800w.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 800, 0, false );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> $this->assertFalse( $out );
</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">- function test_0x800_no_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_0x800_no_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 800h.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 0, 800, false );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> // Cropped versions.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_400x400_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_400x400_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: crop 640x480 to fit 400x400: 400x400 taken from a 480x480 crop at (80. 0).
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 400, 400, true );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> $this->assertSame( array( 0, 0, 0, 80, 400, 400, 480, 480 ), $out );
</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">- function test_400x0_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_400x0_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 400w: 400x300.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 400, 0, true );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</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"> $this->assertSame( array( 0, 0, 0, 0, 400, 533, 480, 640 ), $out );
</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">- function test_0x400_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_0x400_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: resize 640x480 to fit 400h: 533x400.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 0, 400, true );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 0, 0, 0, 0, 300, 400, 480, 640 ), $out );
</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">- function test_400x500_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_400x500_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop at (80. 0).
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 400, 500, true );
</span><span class="cx" style="display: block; padding: 0 10px"> // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 0, 0, 0, 20, 400, 500, 480, 600 ), $out );
</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">- function test_640x480() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_640x480() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Crop 640x480 to fit 640x480 (no change).
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 640, 480, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $out );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19393
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_crop_anchors() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_crop_anchors() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop.
</span><span class="cx" style="display: block; padding: 0 10px"> // src_x = 0 (left), src_y = 0 (top).
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_resize_dimensions( 640, 480, 400, 500, array( 'left', 'top' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/functions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> return $mime_type;
</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">- function test_is_image_positive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_image_positive() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // These are all image files recognized by PHP.
</span><span class="cx" style="display: block; padding: 0 10px"> $files = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test-image-cmyk.jpg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_image_negative() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_image_negative() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // These are actually image files but aren't recognized or usable by PHP.
</span><span class="cx" style="display: block; padding: 0 10px"> $files = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test-image.pct',
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_displayable_image_positive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_displayable_image_positive() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // These are all usable in typical web browsers.
</span><span class="cx" style="display: block; padding: 0 10px"> $files = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test-image.gif',
</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"> }
</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">- function test_is_displayable_image_negative() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_displayable_image_negative() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // These are image files but aren't suitable for web pages because of compatibility or size issues.
</span><span class="cx" style="display: block; padding: 0 10px"> $files = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 'test-image-cmyk.jpg', Allowed in r9727.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50833
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_gd_image_invalid_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_gd_image_invalid_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_gd_image( new stdClass() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_gd_image( array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_gd_image( null ) );
</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"> * @ticket 50833
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension gd
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_gd_image_valid_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_gd_image_valid_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_gd_image( imagecreate( 5, 5 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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->assertInstanceOf( 'WP_Error', $file );
</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">- function mock_image_editor( $editors ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function mock_image_editor( $editors ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'WP_Image_Editor_Mock' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +638,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">- function filter_fallback_intermediate_image_sizes( $fallback_sizes, $metadata ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_fallback_intermediate_image_sizes( $fallback_sizes, $metadata ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the 'test-size' to the list of fallback sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> $fallback_sizes[] = 'test-size';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/header.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/header.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,12 +8,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Image_Header extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public $custom_image_header;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->custom_image_header = new Custom_Image_Header( '__return_null' );
</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">- function test_header_image_has_correct_dimensions_with_max_width() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_image_has_correct_dimensions_with_max_width() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_theme_features['custom-header'][0]['max-width'] = 1600;
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_header_image_has_correct_dimensions_with_fixed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_image_has_correct_dimensions_with_fixed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_wp_theme_features['custom-header'][0]['max-width'] );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_header_image_has_correct_dimensions_with_flex_height() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_image_has_correct_dimensions_with_flex_height() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_wp_theme_features['custom-header'][0]['max-width'] );
</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">- function test_header_image_has_correct_dimensions_with_flex_width() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_image_has_correct_dimensions_with_flex_width() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_wp_theme_features['custom-header'][0]['max-width'] );
</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">- function test_header_image_has_correct_dimensions_with_flex_width_and_height() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_image_has_correct_dimensions_with_flex_width_and_height() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_theme_features['custom-header'][0]['max-width'] = 1800;
</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">
</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">- function test_create_attachment_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_attachment_object() {
</ins><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="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'image/jpeg', $object['post_mime_type'] );
</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">- function test_insert_cropped_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_cropped_attachment() {
</ins><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="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</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"> * @ticket 21819
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_check_get_previous_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_check_get_previous_crop() {
</ins><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="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span></span></pre></div>
<a id="trunktestsphpunittestsimageintermediateSizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/intermediateSize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediateSize.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/intermediateSize.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group upload
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Image_Intermediate_Size extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->remove_added_uploads();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'test-size' );
</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"> return parent::_make_attachment( $upload, $parent_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">- function test_make_intermediate_size_no_size() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_intermediate_size_no_size() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 0, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $image );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_make_intermediate_size_width() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_intermediate_size_width() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $image );
</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"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_make_intermediate_size_height() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_intermediate_size_height() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $image );
</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"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_make_intermediate_size_successful() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_intermediate_size_successful() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 75, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( DIR_TESTDATA . '/images/a2-small-100x75.jpg' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52867
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_image_editor_output_format_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_image_editor_output_format_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter(
</span><span class="cx" style="display: block; padding: 0 10px"> 'image_editor_output_format',
</span><span class="cx" style="display: block; padding: 0 10px"> static function() {
</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"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_intermediate_sizes_by_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_intermediate_sizes_by_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 330, 220, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_intermediate_sizes_by_array_exact() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_intermediate_sizes_by_array_exact() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only one dimention match shouldn't return false positive (see: #17626).
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 330, 220, true );
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'false-height', 330, 400, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_intermediate_sizes_by_array_nearest() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_intermediate_sizes_by_array_nearest() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If an exact size is not found, it should be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> // If not, find nearest size that is larger (see: #17626).
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 450, 300, true );
</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"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_intermediate_sizes_by_array_nearest_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_intermediate_sizes_by_array_nearest_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If an exact size is not found, it should be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> // If not, find nearest size that is larger, otherwise return false (see: #17626).
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'false-height', 330, 100, true );
</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"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_intermediate_sizes_by_array_zero_height() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_intermediate_sizes_by_array_zero_height() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Generate random width.
</span><span class="cx" style="display: block; padding: 0 10px"> $random_w = rand( 300, 400 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 34087
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_intermediate_sizes_by_array_zero_width() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_intermediate_sizes_by_array_zero_width() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 202 is the smallest height that will trigger a miss for 'false-height'.
</span><span class="cx" style="display: block; padding: 0 10px"> $height = 202;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimagemetaphp"></a>
<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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/meta.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/meta.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> stream_wrapper_unregister( 'testimagemeta' );
</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">- function test_exif_d70() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exif_d70() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Exif from a Nikon D70.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0008.jpg' );
</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"> $this->assertSame( '', $out['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_exif_d70_mf() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exif_d70_mf() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Exif from a Nikon D70 - manual focus lens, so some data is unavailable.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );
</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"> // $this->assertSame( array( 'Flowers' ), $out['keywords'] );
</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">- function test_exif_d70_iptc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exif_d70_iptc() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Exif from a Nikon D70 with IPTC data added later.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0007.jpg' );
</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"> $this->assertSame( 'IPTC Headline', $out['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_exif_fuji() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exif_fuji() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Exif from a Fuji FinePix S5600 (thanks Mark).
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/a2-small.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6571
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_exif_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exif_error() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // https://core.trac.wordpress.org/ticket/6571
</span><span class="cx" style="display: block; padding: 0 10px"> // This triggers a warning mesage when reading the Exif block.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/waffles.jpg' );
</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"> $this->assertSame( '', $out['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_exif_no_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exif_no_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No Exif data in this image (from burningwell.org).
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/canola.jpg' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9417
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_utf8_iptc_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_utf8_iptc_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Trilingual UTF-8 text in the ITPC caption-abstract field.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_read_image_metadata( DIR_TESTDATA . '/images/test-image-iptc.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimageresizephp"></a>
<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/resize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/resize.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/resize.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> return array( $this->editor_engine );
</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">- function test_resize_jpg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_jpg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test-image-25x25.jpg', wp_basename( $image ) );
</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"> unlink( $image );
</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">- function test_resize_png() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_png() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.png', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $image ) ) { // WP_Error, stop GLib-GObject-CRITICAL assertion.
</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"> unlink( $image );
</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">- function test_resize_gif() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_gif() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.gif', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $image ) ) { // WP_Error, stop GLib-GObject-CRITICAL assertion.
</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"> unlink( $image );
</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">- function test_resize_webp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_webp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/test-image.webp';
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</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"> unlink( $image );
</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">- function test_resize_larger() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_larger() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // image_resize() should refuse to make an image larger.
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 100, 100 );
</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"> $this->assertSame( 'error_getting_dimensions', $image->get_error_code() );
</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">- function test_resize_thumb_128x96() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_thumb_128x96() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 96 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2007-06-17DSC_4173-64x96.jpg', wp_basename( $image ) );
</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"> unlink( $image );
</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">- function test_resize_thumb_128x0() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_thumb_128x0() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2007-06-17DSC_4173-128x193.jpg', wp_basename( $image ) );
</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"> unlink( $image );
</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">- function test_resize_thumb_0x96() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_thumb_0x96() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 0, 96 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2007-06-17DSC_4173-64x96.jpg', wp_basename( $image ) );
</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"> unlink( $image );
</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">- function test_resize_thumb_150x150_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_thumb_150x150_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 150, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2007-06-17DSC_4173-150x150.jpg', wp_basename( $image ) );
</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"> unlink( $image );
</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">- function test_resize_thumb_150x100_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_thumb_150x100_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 100, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2007-06-17DSC_4173-150x100.jpg', wp_basename( $image ) );
</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"> unlink( $image );
</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">- function test_resize_thumb_50x150_crop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_resize_thumb_50x150_crop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 50, 150, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2007-06-17DSC_4173-50x150.jpg', wp_basename( $image ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsimagesiteIconphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/siteIcon.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/siteIcon.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/siteIcon.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,23 +12,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public $attachment_id = 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_site_icon = new WP_Site_Icon();
</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">- function tear_down() {
- $this->_remove_custom_logo();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
+ $this->remove_custom_logo();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->remove_added_uploads();
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function _remove_custom_logo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function remove_custom_logo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_mod( 'custom_logo' );
</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">- function test_intermediate_image_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_intermediate_image_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_sizes = $this->wp_site_icon->intermediate_image_sizes( array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $sizes, $image_sizes );
</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">- function test_intermediate_image_sizes_with_filter() {
- add_filter( 'site_icon_image_sizes', array( $this, '_custom_test_sizes' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_intermediate_image_sizes_with_filter() {
+ add_filter( 'site_icon_image_sizes', array( $this, 'custom_test_sizes' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_sizes = $this->wp_site_icon->intermediate_image_sizes( array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array();
</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"> // Remove custom size.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes, true ) ] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove the filter we added.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'site_icon_image_sizes', array( $this, '_custom_test_sizes' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'site_icon_image_sizes', array( $this, 'custom_test_sizes' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_additional_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_additional_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_sizes = $this->wp_site_icon->additional_sizes( array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,8 +75,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $sizes, $image_sizes );
</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">- function test_additional_sizes_with_filter() {
- add_filter( 'site_icon_image_sizes', array( $this, '_custom_test_sizes' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_additional_sizes_with_filter() {
+ add_filter( 'site_icon_image_sizes', array( $this, 'custom_test_sizes' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_sizes = $this->wp_site_icon->additional_sizes( array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = 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"> unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes, 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">- function test_create_attachment_object() {
- $attachment_id = $this->_insert_attachment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_attachment_object() {
+ $attachment_id = $this->insert_attachment();
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_url = get_post( $attachment_id )->guid;
</span><span class="cx" style="display: block; padding: 0 10px"> $cropped = str_replace( wp_basename( $parent_url ), 'cropped-test-image.jpg', $parent_url );
</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"> $this->assertSame( $object['guid'], $cropped );
</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">- function test_insert_cropped_attachment() {
- $attachment_id = $this->_insert_attachment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_cropped_attachment() {
+ $attachment_id = $this->insert_attachment();
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_url = get_post( $attachment_id )->guid;
</span><span class="cx" style="display: block; padding: 0 10px"> $cropped = str_replace( wp_basename( $parent_url ), 'cropped-test-image.jpg', $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +124,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( 0, $cropped_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_delete_attachment_data() {
- $attachment_id = $this->_insert_attachment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_attachment_data() {
+ $attachment_id = $this->insert_attachment();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'site_icon', $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_attachment( $attachment_id, true );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34368
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_metadata() {
- $attachment_id = $this->_insert_attachment();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_metadata() {
+ $attachment_id = $this->insert_attachment();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'site_icon', $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_site_icon->get_post_metadata( '', $attachment_id, '_some_post_meta', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,13 +149,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_attachment( $attachment_id, 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">- function _custom_test_sizes( $sizes ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function custom_test_sizes( $sizes ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes[] = 321;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $sizes;
</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">- function _insert_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function insert_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->attachment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->attachment_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsimagesizephp"></a>
<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/size.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/size.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/image/size.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Image_Size extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constrain_dims_zero() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_dims_zero() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No constraint - should have no effect.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions( 640, 480, 0, 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 640, 480 ), $out );
</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"> $this->assertSame( array( 118, 177 ), $out );
</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">- function test_constrain_dims_smaller() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_dims_smaller() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image size is smaller than the constraint - no effect.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions( 500, 600, 1024, 768 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 600 ), $out );
</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"> $this->assertSame( array( 500, 600 ), $out );
</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">- function test_constrain_dims_equal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_dims_equal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image size is equal to the constraint - no effect.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions( 1024, 768, 1024, 768 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 1024, 768 ), $out );
</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"> $this->assertSame( array( 1024, 768 ), $out );
</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">- function test_constrain_dims_larger() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_dims_larger() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image size is larger than the constraint - result should be constrained.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions( 1024, 768, 500, 600 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 375 ), $out );
</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"> $this->assertSame( array( 200, 533 ), $out );
</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">- function test_constrain_dims_boundary() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_dims_boundary() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // One dimension is larger than the constraint, one smaller - result should be constrained.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions( 1024, 768, 500, 800 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 375 ), $out );
</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"> * @expectedDeprecated wp_shrink_dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shrink_dimensions_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shrink_dimensions_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions( 640, 480 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 128, 96 ), $out );
</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"> * @expectedDeprecated wp_shrink_dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shrink_dimensions_smaller() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shrink_dimensions_smaller() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image size is smaller than the constraint - no effect.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions( 500, 600, 1024, 768 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 600 ), $out );
</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"> * @expectedDeprecated wp_shrink_dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shrink_dimensions_equal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shrink_dimensions_equal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image size is equal to the constraint - no effect.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions( 500, 600, 500, 600 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 600 ), $out );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_shrink_dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shrink_dimensions_larger() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shrink_dimensions_larger() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image size is larger than the constraint - result should be constrained.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions( 1024, 768, 500, 600 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 375 ), $out );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_shrink_dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shrink_dimensions_boundary() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shrink_dimensions_boundary() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // One dimension is larger than the constraint, one smaller - result should be constrained.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions( 1024, 768, 500, 800 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 500, 375 ), $out );
</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"> $this->assertSame( array( 525, 700 ), $out );
</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">- function test_constrain_size_for_editor_thumb() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_size_for_editor_thumb() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor( 600, 400, 'thumb' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 150, 100 ), $out );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertSame( array( 64, 64 ), $out );
</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">- function test_constrain_size_for_editor_medium() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_size_for_editor_medium() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Default max width is 500, no constraint on height.
</span><span class="cx" style="display: block; padding: 0 10px"> global $content_width;
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $content_width = $_content_width;
</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">- function test_constrain_size_for_editor_full() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constrain_size_for_editor_full() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $content_width;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_content_width = $content_width;
</span></span></pre></div>
<a id="trunktestsphpunittestsimportimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/import/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/import.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/import/import.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group import
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Import_Import extends WP_Import_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_IMPORTING' ) ) {
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_small_import() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_small_import() {
</ins><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"> $authors = array(
</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"> $this->assertCount( 1, $cats );
</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">- function test_double_import() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_double_import() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $authors = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor' => false,
</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"> $this->assertSame( 1, $comment_count->total_comments );
</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">- function test_ordering_of_importers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ordering_of_importers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_importers;
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_importers = $wp_importers; // Preserve global state.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_importers = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsimportparserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/import/parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/parser.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/import/parser.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group import
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Import_Parser extends WP_Import_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_IMPORTING' ) ) {
</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"> require_once DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php';
</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">- function test_malformed_wxr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_malformed_wxr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/export/malformed.xml';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Regex based parser cannot detect malformed XML.
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_wxr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_wxr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $f1 = DIR_TESTDATA . '/export/missing-version-tag.xml';
</span><span class="cx" style="display: block; padding: 0 10px"> $f2 = DIR_TESTDATA . '/export/invalid-version-tag.xml';
</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"> }
</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">- function test_wxr_version_1_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wxr_version_1_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/export/valid-wxr-1.1.xml';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
</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"> }
</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">- function test_wxr_version_1_0() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wxr_version_1_0() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/export/valid-wxr-1.0.xml';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @link https://core.trac.wordpress.org/ticket/15203
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_escaped_cdata_closing_sequence() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escaped_cdata_closing_sequence() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/export/crazy-cdata-escaped.xml';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensure that the regex parser can still parse invalid CDATA blocks (i.e. those
</span><span class="cx" style="display: block; padding: 0 10px"> * with "]]>" unescaped within a CDATA section).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unescaped_cdata_closing_sequence() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unescaped_cdata_closing_sequence() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/export/crazy-cdata.xml';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parser = new WXR_Parser_Regex;
</span></span></pre></div>
<a id="trunktestsphpunittestsimportpostmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/import/postmeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/postmeta.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/import/postmeta.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group import
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Import_Postmeta extends WP_Import_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_IMPORTING' ) ) {
</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"> require_once DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php';
</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">- function test_serialized_postmeta_no_cdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_postmeta_no_cdata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_import_wp( DIR_TESTDATA . '/export/test-serialized-postmeta-no-cdata.xml', array( 'johncoswell' => 'john' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['special_post_title'] = 'A special title';
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['is_calendar'] = '';
</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"> $this->assertSame( $expected, get_post_meta( 122, 'post-options', 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">- function test_utw_postmeta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_utw_postmeta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_import_wp( DIR_TESTDATA . '/export/test-utw-post-meta-import.xml', array( 'johncoswell' => 'john' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classy = new StdClass();
</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"> * @ticket 9633
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_serialized_postmeta_with_cdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_postmeta_with_cdata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_import_wp( DIR_TESTDATA . '/export/test-serialized-postmeta-with-cdata.xml', array( 'johncoswell' => 'johncoswell' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // HTML in the CDATA should work with old WordPress version.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11574
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_serialized_postmeta_with_evil_stuff_in_cdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_postmeta_with_evil_stuff_in_cdata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_import_wp( DIR_TESTDATA . '/export/test-serialized-postmeta-with-cdata.xml', array( 'johncoswell' => 'johncoswell' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Evil content in the CDATA.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<wp:meta_value>evil</wp:meta_value>', get_post_meta( 10, 'evil', true ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsincludesfactoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/includes/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/factory.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/includes/factory.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,28 +1,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class TestFactoryFor extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->category_factory = new WP_UnitTest_Factory_For_Term( null, 'category' );
</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">- function test_create_creates_a_category() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_creates_a_category() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $this->category_factory->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( (bool) get_term_by( 'id', $id, 'category' ) );
</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">- function test_get_object_by_id_gets_an_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_object_by_id_gets_an_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $this->category_factory->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( (bool) $this->category_factory->get_object_by_id( $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">- function test_get_object_by_id_gets_an_object_with_the_same_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_object_by_id_gets_an_object_with_the_same_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $this->category_factory->create( array( 'name' => 'Boo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $object = $this->category_factory->get_object_by_id( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Boo', $object->name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_taxonomy_argument_overrules_the_factory_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_taxonomy_argument_overrules_the_factory_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_factory = new WP_UnitTest_Factory_For_term( null, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $term_factory->create( array( 'taxonomy' => 'post_tag' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $id, 'post_tag' );
</span></span></pre></div>
<a id="trunktestsphpunittestsincludeshelpersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/includes/helpers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/helpers.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/includes/helpers.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30522
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_assertSameSets() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_assertSameSets() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, 2, 3 ), // Test expected.
</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_assertSameSets
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30522
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_assertSameSets( $expected, $actual, $exception ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_assertSameSets( $expected, $actual, $exception ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $exception ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $expected, $actual );
</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"> * @ticket 30522
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_assertSameSetsWithIndex() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_assertSameSetsWithIndex() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, 2, 3 ), // Test expected.
</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 data_assertSameSetsWithIndex
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30522
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_assertSameSetsWithIndex( $expected, $actual, $exception ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_assertSameSetsWithIndex( $expected, $actual, $exception ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $exception ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSetsWithIndex( $expected, $actual );
</span></span></pre></div>
<a id="trunktestsphpunittestsksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/kses.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param string $string Test string for kses.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expect_string Expected result after passing through kses.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_post_kses_address( $string, $expect_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_post_kses_address( $string, $expect_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
</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"> * @type string $expect_string Expected result after passing through kses.
</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">- function data_wp_filter_post_kses_address() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_filter_post_kses_address() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'classname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'id',
</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"> * @param string $expect_string Expected result after passing through kses.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_post_kses_a( $string, $expect_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_post_kses_a( $string, $expect_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
</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"> * @type string $expect_string Expected result after passing through kses.
</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">- function data_wp_filter_post_kses_a() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_filter_post_kses_a() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'classname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Context to use for parsing source.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected Expected output following KSES parsing.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_video( $source, $context, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_video( $source, $context, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_kses( $source, $context );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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"> * @type string $expected Expected output following KSES parsing.
</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">- function data_wp_kses_video() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_kses_video() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Set 0: Valid post object params in post context.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expect_string Expected result after passing through kses.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_post_kses_abbr( $string, $expect_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_post_kses_abbr( $string, $expect_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
</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"> * @type string $expect_string Expected result after passing through kses.
</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">- function data_wp_filter_post_kses_abbr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_filter_post_kses_abbr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'classname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_feed_links() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_feed_links() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</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"> $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
</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">- function test_wp_kses_bad_protocol() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_bad_protocol() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bad = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'dummy:alert(1)',
</span><span class="cx" style="display: block; padding: 0 10px"> 'javascript:alert(1)',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _wp_kses_allowed_html_filter( $html, $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_kses_allowed_html_filter( $html, $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' === $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'a' => array( 'href' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,17 +523,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $custom_tags, wp_kses_allowed_html( $custom_tags ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wp_kses_allowed_html', array( $this, '_wp_kses_allowed_html_filter' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_kses_allowed_html', array( $this, 'wp_kses_allowed_html_filter' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'a' => array( 'href' => true ) ), wp_kses_allowed_html( 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'a' => array( 'href' => false ) ), wp_kses_allowed_html( '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">- remove_filter( 'wp_kses_allowed_html', array( $this, '_wp_kses_allowed_html_filter' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_kses_allowed_html', array( $this, 'wp_kses_allowed_html_filter' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $allowedposttags, wp_kses_allowed_html( 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $allowedtags, wp_kses_allowed_html( '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">- function test_hyphenated_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hyphenated_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $string = '<hyphenated-tag attribute="value" otherattribute="value2">Alot of hyphens.</hyphenated-tag>';
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_tags = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hyphenated-tag' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,13 +568,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28506
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_ctrl_removal
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ctrl_removal( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ctrl_removal( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_kses( $input, $allowedposttags ) );
</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">- function data_ctrl_removal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_ctrl_removal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\X1C\x1D\x1E\x1F",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,13 +605,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28699
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_slash_zero_removal
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_slash_zero_removal( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_slash_zero_removal( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_kses( $input, $allowedposttags ) );
</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">- function data_slash_zero_removal() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_slash_zero_removal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'This \\0 should be no big deal.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,11 +657,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_hair_parse
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hair_parse( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hair_parse( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_kses_hair_parse( $input ) );
</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">- function data_hair_parse() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_hair_parse() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title="hello" href="#" id="my_id" ',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,11 +723,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_attr_parse
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_attr_parse( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attr_parse( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_kses_attr_parse( $input ) );
</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">- function data_attr_parse() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_attr_parse() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a title="hello" href="#" id="my_id" >',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,11 +781,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_one_attr
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_one_attr( $element, $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_one_attr( $element, $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, wp_kses_one_attr( $input, $element ) );
</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">- function data_one_attr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_one_attr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +858,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34063
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bdo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bdo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $input = '<p>This is <bdo dir="rtl">a BDO tag</bdo>. Weird, <bdo dir="ltr">right?</bdo></p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +869,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35079
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ol_reversed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ol_reversed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $input = '<ol reversed="reversed"><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +880,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40680
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_attr_no_attributes_allowed_with_empty_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_attr_no_attributes_allowed_with_empty_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $element = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute = 'title="foo" class="bar"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +890,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40680
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_attr_no_attributes_allowed_with_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_attr_no_attributes_allowed_with_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $element = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute = 'title="foo" class="bar"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,7 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40680
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_attr_single_attribute_is_allowed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_attr_single_attribute_is_allowed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $element = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute = 'title="foo" class="bar"';
</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"> * @ticket 43312
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_attr_no_attributes_allowed_with_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_attr_no_attributes_allowed_with_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $element = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute = 'title="foo" class="bar"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,7 +1116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_attr_data_attribute_is_allowed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_attr_data_attribute_is_allowed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test = '<div data-foo="foo" data-bar="bar" datainvalid="gone" data--invaild="gone" data-also-invaild-="gone" data-two-hyphens="remains">Pens and pencils</div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '<div data-foo="foo" data-bar="bar" data-two-hyphens="remains">Pens and pencils</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,7 +1128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wildcard_requires_hyphen_after_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wildcard_requires_hyphen_after_prefix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'div' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-*' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1149,7 +1149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wildcard_allows_two_hyphens() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wildcard_allows_two_hyphens() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'div' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-*' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1171,7 +1171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33121
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wildcard_attribute_prefixes( $wildcard_attribute, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wildcard_attribute_prefixes( $wildcard_attribute, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'div' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> $wildcard_attribute => true,
</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"> * [0] The prefix being tested.
</span><span class="cx" style="display: block; padding: 0 10px"> * [1] The outcome of `wp_kses_attr_check` for the prefix.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_wildcard_attribute_prefixes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wildcard_attribute_prefixes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Ends correctly.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'data-*', true ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1218,7 +1218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $input string The style attribute saved in the editor.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $expected string The sanitized style attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_kses_style_attr_with_url( $input, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_kses_style_attr_with_url( $input, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = safecss_filter_attr( $input );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1229,7 +1229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Nested array of input, expected pairs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_kses_style_attr_with_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_kses_style_attr_with_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Valid use cases.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1462,7 +1462,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50731
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_img_tag_standard_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_img_tag_standard_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<img',
</span><span class="cx" style="display: block; padding: 0 10px"> 'loading="lazy"',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1484,7 +1484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53156
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_kses_main_tag_standard_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_main_tag_standard_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<main',
</span><span class="cx" style="display: block; padding: 0 10px"> 'class="wp-group-block"',
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nloadTextdomainphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/l10n/loadTextdomain.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/loadTextdomain.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/l10n/loadTextdomain.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,13 +109,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21319
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'just some string', 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
</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">- function test_override_load_textdomain_noop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_override_load_textdomain_noop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'override_load_textdomain', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px"> $load_textdomain = load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/non-existent-file' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'override_load_textdomain', '__return_true' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,10 +124,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
</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">- function test_override_load_textdomain_non_existent_mofile() {
- add_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_override_load_textdomain_non_existent_mofile() {
+ add_filter( 'override_load_textdomain', array( $this, 'override_load_textdomain_filter' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $load_textdomain = load_textdomain( 'wp-tests-domain', WP_LANG_DIR . '/non-existent-file.mo' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'override_load_textdomain', array( $this, 'override_load_textdomain_filter' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_textdomain_loaded = is_textdomain_loaded( 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px"> unload_textdomain( 'wp-tests-domain' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,10 +138,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $is_textdomain_loaded_after );
</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">- function test_override_load_textdomain_custom_mofile() {
- add_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_override_load_textdomain_custom_mofile() {
+ add_filter( 'override_load_textdomain', array( $this, 'override_load_textdomain_filter' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $load_textdomain = load_textdomain( 'wp-tests-domain', WP_LANG_DIR . '/plugins/internationalized-plugin-de_DE.mo' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'override_load_textdomain', array( $this, 'override_load_textdomain_filter' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_textdomain_loaded = is_textdomain_loaded( 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px"> unload_textdomain( 'wp-tests-domain' );
</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"> * @param string $file Path to the MO file.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _override_load_textdomain_filter( $override, $domain, $file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function override_load_textdomain_filter( $override, $domain, $file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $l10n;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_readable( $file ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsl10ntranslateSettingsUsingI18nSchemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/l10n/translateSettingsUsingI18nSchema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/translateSettingsUsingI18nSchema.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/l10n/translateSettingsUsingI18nSchema.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_set_locale_to_polish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_locale_to_polish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'pl_PL';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53238
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_translate_settings_using_i18n_schema() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translate_settings_using_i18n_schema() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $textdomain = 'notice';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/l10n.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35961
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_n_noop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_n_noop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text_domain = 'text-domain';
</span><span class="cx" style="display: block; padding: 0 10px"> $nooped_plural = _n_noop( '%s post', '%s posts', $text_domain );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35961
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nx_noop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nx_noop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text_domain = 'text-domain';
</span><span class="cx" style="display: block; padding: 0 10px"> $nooped_plural = _nx_noop( '%s post', '%s posts', 'my-context', $text_domain );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35073
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_before_last_bar() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_before_last_bar() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'no-bar-at-all', before_last_bar( 'no-bar-at-all' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'before-last-bar', before_last_bar( 'before-last-bar|after-bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'first-before-bar|second-before-bar', before_last_bar( 'first-before-bar|second-before-bar|after-last-bar' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35950
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_available_languages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_available_languages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $array = get_available_languages();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $array );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 35284
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_installed_translations_for_core() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_installed_translations_for_core() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $installed_translations = wp_get_installed_translations( 'core' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $installed_translations );
</span><span class="cx" style="display: block; padding: 0 10px"> $textdomains_expected = array( 'admin', 'admin-network', 'continents-cities', 'default' );
</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"> * @ticket 35294
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_dropdown_languages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_languages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38632
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_dropdown_languages_site_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_languages_site_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</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"> * @ticket 44494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_dropdown_languages_exclude_en_us() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_languages_exclude_en_us() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</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"> * @ticket 38632
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_dropdown_languages_en_US_selected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_languages_en_US_selected() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</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"> * Add site default language to ja_JP in dropdown
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_dropdown_languages_site_default_ja_JP() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_languages_site_default_ja_JP() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</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"> * Select dropdown language from de_DE to ja_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">- function test_wp_dropdown_languages_ja_JP_selected() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_languages_ja_JP_selected() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function wp_dropdown_languages_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function wp_dropdown_languages_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'de_DE' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'language' => 'de_DE',
</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"> * @ticket 35284
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_pomo_file_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_pomo_file_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/pomo/empty.po';
</span><span class="cx" style="display: block; padding: 0 10px"> $array = wp_get_pomo_file_data( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'POT-Creation-Date', $array );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_excerpt_should_be_counted_by_words() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_excerpt_should_be_counted_by_words() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'en_US' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_excerpt_should_be_counted_by_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_excerpt_should_be_counted_by_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_excerpt_should_be_counted_by_chars_in_japanese() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_excerpt_should_be_counted_by_chars_in_japanese() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +345,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_excerpt_rss_should_be_counted_by_words() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_excerpt_rss_should_be_counted_by_words() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'en_US' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_excerpt_rss_should_be_counted_by_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_excerpt_rss_should_be_counted_by_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_draft_should_be_counted_by_words() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_draft_should_be_counted_by_words() {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/dashboard.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'en_US' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_draft_should_be_counted_by_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_draft_should_be_counted_by_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/dashboard.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_draft_should_be_counted_by_chars_in_japanese() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_draft_should_be_counted_by_chars_in_japanese() {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/dashboard.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_comment_excerpt_should_be_counted_by_words() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_comment_excerpt_should_be_counted_by_words() {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'en_US' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_comment_excerpt_should_be_counted_by_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_comment_excerpt_should_be_counted_by_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44541
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_length_of_comment_excerpt_should_be_counted_by_chars_in_Japanese() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_length_of_comment_excerpt_should_be_counted_by_chars_in_Japanese() {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'ja_JP' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetAdjacentPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/link/getAdjacentPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getAdjacentPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/link/getAdjacentPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22112
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_adjacent_post_exclude_self_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_adjacent_post_exclude_self_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bump term_taxonomy to mimic shared term offsets.
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span></span></pre></div>
<a id="trunktestsphpunittestslinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/link.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Link extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _get_pagenum_link_cb( $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_pagenum_link_cb( $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $url . '/WooHoo';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,22 +11,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pagenum_link_case_insensitivity() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pagenum_link_case_insensitivity() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_req_uri = $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'home_url', array( $this, '_get_pagenum_link_cb' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'home_url', array( $this, 'get_pagenum_link_cb' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = '/woohoo';
</span><span class="cx" style="display: block; padding: 0 10px"> $paged = get_pagenum_link( 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">- remove_filter( 'home_url', array( $this, '_get_pagenum_link_cb' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'home_url', array( $this, 'get_pagenum_link_cb' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $paged, home_url( '/WooHoo/page/2/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = $old_req_uri;
</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">- function test_wp_get_shortlink() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_shortlink() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id2 = self::factory()->post->create();
</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"> $this->assertSame( home_url( '?p=' . $post_id ), wp_get_shortlink() );
</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">- function test_wp_get_shortlink_with_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_shortlink_with_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Basic case.
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_shortlink_with_home_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_shortlink_with_home_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $post_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsloadwpConvertHrToBytesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/load/wpConvertHrToBytes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/load/wpConvertHrToBytes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/load/wpConvertHrToBytes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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 int|string $value The value passed to wp_convert_hr_to_bytes().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $expected The expected output of wp_convert_hr_to_bytes().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_convert_hr_to_bytes( $value, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_convert_hr_to_bytes( $value, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_convert_hr_to_bytes( $value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,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">- function data_wp_convert_hr_to_bytes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_convert_hr_to_bytes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $array = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Integer input.
</span><span class="cx" style="display: block; padding: 0 10px"> array( -1, -1 ), // = no memory limit.
</span></span></pre></div>
<a id="trunktestsphpunittestsloadwpIsIniValueChangeablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/load/wpIsIniValueChangeable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/load/wpIsIniValueChangeable.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/load/wpIsIniValueChangeable.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param string $setting The setting passed to wp_is_ini_value_changeable().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected The expected output of wp_convert_hr_to_bytes().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_is_ini_value_changeable( $setting, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_is_ini_value_changeable( $setting, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_is_ini_value_changeable( $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">@@ -32,7 +32,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">- function data_wp_is_ini_value_changeable() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_is_ini_value_changeable() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $array = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'memory_limit', true ), // PHP_INI_ALL.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'log_errors', true ), // PHP_INI_ALL.
</span></span></pre></div>
<a id="trunktestsphpunittestsmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/mail.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/mail.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,12 +4,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group mail
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Mail extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * all variables, which means that following tests would fail. To solve this issue we set `$this->Encoding`
</span><span class="cx" style="display: block; padding: 0 10px"> * back to 8bit in `MockPHPMailer::preSend`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_mail_break_it() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_break_it() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_repeat( 'A', 1000 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_mail( WP_TESTS_EMAIL, 'Looong line testing', $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">- function test_wp_mail_custom_boundaries() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_custom_boundaries() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to = 'user@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = 'Test email with custom boundaries';
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = '' . "\n";
</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"> * @ticket 17305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_mail_rfc2822_addresses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_rfc2822_addresses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to = 'Name <address@tld.com>';
</span><span class="cx" style="display: block; padding: 0 10px"> $from = 'Another Name <another_address@different-tld.com>';
</span><span class="cx" style="display: block; padding: 0 10px"> $cc = 'The Carbon Guy <cc@cc.com>';
</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"> * @ticket 17305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_mail_multiple_rfc2822_to_addresses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_multiple_rfc2822_to_addresses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to = 'Name <address@tld.com>, Another Name <another_address@different-tld.com>';
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = 'RFC2822 Testing';
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 'My RFC822 Test Message';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameIgnoreEOL( $message . "\n", $mailer->get_sent()->body );
</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">- function test_wp_mail_multiple_to_addresses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_multiple_to_addresses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to = 'address@tld.com, another_address@different-tld.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = 'RFC2822 Testing';
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 'My RFC822 Test Message';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18463
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_mail_to_address_no_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_to_address_no_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to = '<address@tld.com>';
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = 'RFC2822 Testing';
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 'My RFC822 Test Message';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23642
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_mail_return_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_return_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No errors.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,11 +289,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, substr_count( $mailer->get_sent()->header, $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">- function wp_mail_quoted_printable( $mailer ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_mail_quoted_printable( $mailer ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mailer->Encoding = 'quoted-printable';
</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">- function wp_mail_set_text_message( $mailer ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_mail_set_text_message( $mailer ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mailer->AltBody = 'Wörld';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28039
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_mail_content_transfer_encoding_in_quoted_printable_multipart() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_mail_content_transfer_encoding_in_quoted_printable_multipart() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'phpmailer_init', array( $this, 'wp_mail_quoted_printable' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'phpmailer_init', array( $this, 'wp_mail_set_text_message' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50720
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_phpmailer_validator() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_phpmailer_validator() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $phpmailer = $GLOBALS['phpmailer'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $phpmailer->validateAddress( 'foo@192.168.1.1' ), 'Assert PHPMailer accepts IP address email addresses' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediagetAdjacentImageLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media/getAdjacentImageLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/getAdjacentImageLink.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/media/getAdjacentImageLink.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_adjacent_image_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">- function test_get_adjacent_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_adjacent_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $expected, $args ) = $this->setup_test_scenario( $current_attachment_index, $expected_attachment_index, $expected, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_adjacent_image_link( ...$args );
</span></span></pre></div>
<a id="trunktestsphpunittestsmediagetNextImageLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media/getNextImageLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/getNextImageLink.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/media/getNextImageLink.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_next_image_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">- function test_get_next_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_next_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $expected, $args ) = $this->setup_test_scenario( $current_attachment_index, $expected_attachment_index, $expected, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_next_image_link( ...$args );
</span></span></pre></div>
<a id="trunktestsphpunittestsmediagetPreviousImageLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media/getPreviousImageLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/getPreviousImageLink.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/media/getPreviousImageLink.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_previous_image_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">- function test_get_previous_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_previous_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $expected, $args ) = $this->setup_test_scenario( $current_attachment_index, $expected_attachment_index, $expected, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_previous_image_link( ...$args );
</span></span></pre></div>
<a id="trunktestsphpunittestsmedianextImageLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media/nextImageLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/nextImageLink.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/media/nextImageLink.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_next_image_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">- function test_next_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_next_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $expected, $args ) = $this->setup_test_scenario( $current_attachment_index, $expected_attachment_index, $expected, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected );
</span></span></pre></div>
<a id="trunktestsphpunittestsmediapreviousImageLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media/previousImageLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/previousImageLink.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/media/previousImageLink.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_previous_image_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">- function test_previous_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_previous_image_link( $current_attachment_index, $expected_attachment_index, $expected, array $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $expected, $args ) = $this->setup_test_scenario( $current_attachment_index, $expected_attachment_index, $expected, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected );
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/media.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> parent::tear_down_after_class();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->caption = 'A simple caption.';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->alternate_caption = 'Alternate caption.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,13 +76,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_added() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_added() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'img_caption_shortcode', $shortcode_tags['caption'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'img_caption_shortcode', $shortcode_tags['wp_caption'] );
</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">- function test_img_caption_shortcode_with_empty_params() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_with_empty_params() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode( array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $result );
</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"> * @ticket 33981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_with_empty_params_but_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_with_empty_params_but_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode( array(), $this->caption );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->caption, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @ticket 33981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_short_circuit_filter() {
- add_filter( 'img_caption_shortcode', array( $this, '_return_alt_caption' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_short_circuit_filter() {
+ add_filter( 'img_caption_shortcode', array( $this, 'return_alt_caption' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode( array(), $this->caption );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->alternate_caption, $result );
</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"> * Filter used in test_img_caption_shortcode_short_circuit_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">- function _return_alt_caption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_alt_caption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->alternate_caption;
</span><span class="cx" style="display: block; padding: 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"> * @ticket 33981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_empty_width() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_empty_width() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_empty_caption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_empty_caption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_empty_caption_and_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_empty_caption_and_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '',
</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"> $this->assertSame( $this->caption, $result );
</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">- function test_img_caption_shortcode_with_old_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_with_old_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 20,
</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"> }
</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">- function test_img_caption_shortcode_with_old_format_id_and_align() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_with_old_format_id_and_align() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 20,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
</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">- function test_img_caption_shortcode_with_old_format_and_class() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_with_old_format_and_class() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 20,
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_img_caption_shortcode_with_html_caption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_img_caption_shortcode_with_html_caption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 20,
</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"> $this->assertSame( 1, preg_match_all( "~{$our_preg}~", $result, $_r ) );
</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">- function test_new_img_caption_shortcode_new_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_img_caption_shortcode_new_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'width' => 20 ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->img_content . $this->html_content
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
</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">- function test_new_img_caption_shortcode_new_format_and_linked_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_img_caption_shortcode_new_format_and_linked_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $linked_image = "<a href='#'>{$this->img_content}</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'width' => 20 ),
</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"> $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
</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">- function test_new_img_caption_shortcode_new_format_and_linked_image_with_newline() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_img_caption_shortcode_new_format_and_linked_image_with_newline() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $linked_image = "<a href='#'>{$this->img_content}</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'width' => 20 ),
</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"> * @ticket 34595
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_img_caption_shortcode_has_aria_describedby() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_img_caption_shortcode_has_aria_describedby() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = img_caption_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 20,
</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"> $this->assertSame( 1, preg_match_all( '/aria-describedby="caption-myId"/', $result, $_r ) );
</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">- function test_add_remove_oembed_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_remove_oembed_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_oembed_add_provider( 'http://foo.bar/*', 'http://foo.bar/oembed' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_oembed_remove_provider( 'http://foo.bar/*' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_oembed_remove_provider( 'http://foo.bar/*' ) );
</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"> * @ticket 23776
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_autoembed_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_autoembed_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_embed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group external-http
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_autoembed_no_paragraphs_around_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_autoembed_no_paragraphs_around_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_embed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</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"> $this->assertSame( $content, $result );
</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">- function data_autoembed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_autoembed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should embed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,13 +362,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_autoembed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_autoembed( $content, $result = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_autoembed( $content, $result = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_embed = new Test_Autoembed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $wp_embed->autoembed( $content ), $result ? $result : $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">- function test_wp_prepare_attachment_for_js() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_prepare_attachment_for_js() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Attachment without media.
</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">@@ -422,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38965
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_prepare_attachment_for_js_without_image_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_prepare_attachment_for_js_without_image_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create the attachement post.
</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">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19067
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_convert_bytes_to_hr
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_convert_bytes_to_hr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_convert_bytes_to_hr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $kb = 1024;
</span><span class="cx" style="display: block; padding: 0 10px"> $mb = $kb * 1024;
</span><span class="cx" style="display: block; padding: 0 10px"> $gb = $mb * 1024;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22960
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_attached_images() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_attached_images() {
</ins><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"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->img_name,
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22960
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_galleries_images() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_galleries_images() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ids1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 3 ) as $i ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39304
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_galleries_images_without_global_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_galleries_images_without_global_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up an unattached image.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39304
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_galleries_ignores_global_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_galleries_ignores_global_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_post_id = $this->factory->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Global Post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39304
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_galleries_respects_id_attrs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_galleries_respects_id_attrs() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'No gallery defined',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22960
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_gallery_images() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_gallery_images() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ids1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 3 ) as $i ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,7 +707,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $srcs, $ids1_srcs );
</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">- function test_get_media_embedded_in_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_media_embedded_in_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object = <<<OBJ
</span><span class="cx" style="display: block; padding: 0 10px"> <object src="this" data="that">
</span><span class="cx" style="display: block; padding: 0 10px"> <param name="value"/>
</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"> $this->assertSame( $contents, $matches );
</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">- function test_get_media_embedded_in_content_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_media_embedded_in_content_order() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $audio = <<<AUDIO
</span><span class="cx" style="display: block; padding: 0 10px"> <audio preload="none">
</span><span class="cx" style="display: block; padding: 0 10px"> <source />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,7 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35367
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_audio_shortcode_with_empty_params() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_audio_shortcode_with_empty_params() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( wp_audio_shortcode( array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,7 +802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35367
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_audio_shortcode_with_bad_attr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_audio_shortcode_with_bad_attr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="wp-embedded-audio" href="https://example.com/foo.php">https://example.com/foo.php</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_audio_shortcode(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,7 +816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35367
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_audio_shortcode_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_audio_shortcode_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_audio_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'https://example.com/foo.mp3',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -852,7 +852,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test [video] shortcode processing
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_video_shortcode_body() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_video_shortcode_body() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $width = 720;
</span><span class="cx" style="display: block; padding: 0 10px"> $height = 480;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,7 +898,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35367
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_with_empty_params() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_with_empty_params() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( wp_video_shortcode( array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,7 +906,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35367
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_with_bad_attr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_with_bad_attr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="wp-embedded-video" href="https://example.com/foo.php">https://example.com/foo.php</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_video_shortcode(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,7 +921,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35367
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_attributes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_attributes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_video_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'https://example.com/foo.mp4',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -963,7 +963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40866
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_youtube_remove_feature() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_youtube_remove_feature() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_video_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'https://www.youtube.com/watch?v=72xdCU__XCk&feature=youtu.be',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -977,7 +977,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40866
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_youtube_force_ssl() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_youtube_force_ssl() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_video_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'http://www.youtube.com/watch?v=72xdCU__XCk',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,7 +991,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40866
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_vimeo_force_ssl_remove_query_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_vimeo_force_ssl_remove_query_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_video_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'http://vimeo.com/76979871?blah=meh',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1006,7 +1006,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40977
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_vimeo_adds_loop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_vimeo_adds_loop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_video_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'http://vimeo.com/76979871',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1020,7 +1020,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40977
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_video_shortcode_body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_video_shortcode_vimeo_force_adds_loop_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_video_shortcode_vimeo_force_adds_loop_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_video_shortcode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => 'http://vimeo.com/76979871',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,7 +1034,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26768
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_image_size() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_image_size() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'test-size' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,7 +1055,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26768
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remove_image_size() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_image_size() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 200, 600 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_image_size( 'test-size' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'test-size' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1065,7 +1065,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26951
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_image_size() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_image_size() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 200, 600 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_image_size( 'test-size' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,7 +1076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30346
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_attachment_url_to_postid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_url_to_postid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1094,7 +1094,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33109
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_attachment_url_to_postid_with_different_scheme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_url_to_postid_with_different_scheme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1112,7 +1112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39768
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_attachment_url_to_postid_should_be_case_sensitive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_url_to_postid_should_be_case_sensitive() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_path_lower_case = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id_lower_case = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path_lower_case,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1137,7 +1137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $attachment_id_upper_case, attachment_url_to_postid( $image_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">- function test_attachment_url_to_postid_filtered() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_url_to_postid_filtered() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1148,13 +1148,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_dir', array( $this, '_upload_dir' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'upload_dir', array( $this, 'upload_dir' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_url = 'http://192.168.1.20.com/wp-content/uploads/' . $image_path;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $attachment_id, attachment_url_to_postid( $image_url ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'upload_dir', array( $this, '_upload_dir' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'upload_dir', array( $this, 'upload_dir' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _upload_dir( $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function upload_dir( $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dir['baseurl'] = 'http://192.168.1.20.com/wp-content/uploads';
</span><span class="cx" style="display: block; padding: 0 10px"> return $dir;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1162,7 +1162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31044
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_attachment_url_to_postid_with_empty_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_url_to_postid_with_empty_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = attachment_url_to_postid( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1249,7 +1249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33016
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiline_cdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiline_cdata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_embed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,7 +1266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33016
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiline_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiline_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_embed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1285,7 +1285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group external-http
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiline_comment_with_embeds() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiline_comment_with_embeds() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> Start.
</span><span class="cx" style="display: block; padding: 0 10px"> [embed]http://www.youtube.com/embed/TEST01YRHA0[/embed]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1318,7 +1318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33016
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_wp_embed_shortcode_custom( $content, $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_wp_embed_shortcode_custom( $content, $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'https://www.example.com/?video=1' === $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '@embed URL was replaced@';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1330,7 +1330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group external-http
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_oembed_explicit_media_link() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_explicit_media_link() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_embed;
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'embed_maybe_make_link', array( $this, 'filter_wp_embed_shortcode_custom' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1367,7 +1367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34635
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = image_downsize( self::$large_id, 'thumbnail' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" />',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,7 +1382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50801
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_filter_output() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_filter_output() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = image_downsize( self::$large_id, 'thumbnail' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'Override wp_get_attachment_image';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1393,7 +1393,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $output );
</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">- function filter_wp_get_attachment_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_wp_get_attachment_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'Override wp_get_attachment_image';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1402,7 +1402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34635
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_with_alt() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_with_alt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add test alt metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( self::$large_id, '_wp_attachment_image_alt', 'Some very clever alt text', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1423,7 +1423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33878
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_attachment_image_url( 0 ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1444,7 +1444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12235
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_caption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_caption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_attachment_caption( 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $caption = 'This is a caption.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1468,7 +1468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12235
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_caption_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_caption_empty() {
</ins><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"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->img_name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1486,7 +1486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Helper function to get image size array from size "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">- function _get_image_size_array_from_meta( $image_meta, $size_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_image_size_array_from_meta( $image_meta, $size_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $array = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $image_meta ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1507,7 +1507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Helper function to move the src image to the first position in the expected srcset string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _src_first( $srcset, $src_url, $src_width ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function src_first( $srcset, $src_url, $src_width ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $src_string = $src_url . ' ' . $src_width . 'w';
</span><span class="cx" style="display: block; padding: 0 10px"> $src_not_first = ', ' . $src_string;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,7 +1523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $year_month = gmdate( 'Y/m' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1553,7 +1553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_url = wp_get_attachment_image_url( self::$large_id, $int );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, $int );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'full' === $int ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the full size image. Expected to be in the srcset when the full size image is used as src.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1562,7 +1562,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_expected = $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">- $expected_srcset = $this->_src_first( $_expected, $image_url, $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $this->src_first( $_expected, $image_url, $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1571,7 +1571,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_no_date_uploads() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_no_date_uploads() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Disable date organized uploads.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1605,7 +1605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = trim( $expected, ' ,' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, $int );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_url = wp_get_attachment_image_url( $id, $int );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'full' === $int ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1615,7 +1615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_expected = $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">- $expected_srcset = $this->_src_first( $_expected, $image_url, $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $this->src_first( $_expected, $image_url, $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1628,12 +1628,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_with_edits() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_with_edits() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // For this test we're going to mock metadata changes from an edit.
</span><span class="cx" style="display: block; padding: 0 10px"> // Start by getting the attachment metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_url = wp_get_attachment_image_url( self::$large_id, 'medium' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy hash generation method used in wp_save_image().
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = 'e' . time() . rand( 100, 999 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,7 +1662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35106
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_with_absolute_path_in_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_with_absolute_path_in_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $year_month = gmdate( 'Y/m' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1696,7 +1696,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_url = wp_get_attachment_image_url( self::$large_id, $int );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, $int );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'full' === $int ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the full size image. Expected to be in the srcset when the full size image is used as src.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1705,7 +1705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_expected = $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">- $expected_srcset = $this->_src_first( $_expected, $image_url, $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $this->src_first( $_expected, $image_url, $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1713,7 +1713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes = wp_calculate_image_srcset( array( 400, 300 ), 'file.png', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For canola.jpg we should return.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1724,7 +1724,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_no_width() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_no_width() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = get_attached_file( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_url = wp_get_attachment_image_url( self::$large_id, 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_generate_attachment_metadata( self::$large_id, $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1741,7 +1741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34955
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_ratio_variance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_ratio_variance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Mock data for this test.
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = array( 218, 300 );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-768x1055-218x300.png';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1790,7 +1790,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35108
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_include_src() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_include_src() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Mock data for this test.
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = array( 2000, 1000 );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test.png';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1839,7 +1839,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35480
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_corrupted_image_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_corrupted_image_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $size_array = array( 300, 150 );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-300x150.png';
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1913,7 +1913,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36549
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_with_spaces_in_filenames() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_with_spaces_in_filenames() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Mock data for this test.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test image-300x150.png';
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1961,7 +1961,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_srcset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_srcset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1992,7 +1992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
</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_srcset = $this->_src_first( $expected, $uploads_dir . $image_meta['file'], $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $this->src_first( $expected, $uploads_dir . $image_meta['file'], $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, $srcset );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2000,7 +2000,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_srcset_single_srcset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_srcset_single_srcset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = array( 150, 150 );
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2015,7 +2015,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_srcset_invalidsize() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_srcset_invalidsize() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $invalid_size = 'nailthumb';
</span><span class="cx" style="display: block; padding: 0 10px"> $original_size = array( 1600, 1200 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2031,7 +2031,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test sizes against the default WP sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> $intermediates = array( 'thumbnail', 'medium', 'medium_large', 'large' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2052,7 +2052,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test sizes against the default WP sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> $intermediates = array( 'thumbnail', 'medium', 'medium_large', 'large' );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2061,7 +2061,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_all_filters( 'wp_calculate_image_sizes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int_size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int_size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, $int_size );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_src = $image_meta['sizes'][ $int_size ]['file'];
</span><span class="cx" style="display: block; padding: 0 10px"> list( $width, $height ) = $size_array;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2076,9 +2076,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_srcset_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_srcset_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( self::$large_id, $size_array, $image_meta ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2166,7 +2166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34898
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_srcset_sizes_wrong() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_srcset_sizes_wrong() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_img_tag_add_loading_attr( $img, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2179,7 +2179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_srcset_sizes_with_preexisting_srcset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_srcset_sizes_with_preexisting_srcset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Generate HTML and add a dummy srcset attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_img_tag_add_loading_attr( $img, 'test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2193,7 +2193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34528
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_calculate_image_srcset_animated_gifs() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_calculate_image_srcset_animated_gifs() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Mock meta for an animated gif.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1200,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2238,9 +2238,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_schemes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_schemes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( self::$large_id, $size_array, $image_meta ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2289,7 +2289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34945
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_with_https_on() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_with_https_on() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Mock meta for the image.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1200,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2334,7 +2334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36084
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_image_send_to_editor_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_image_send_to_editor_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::$large_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $caption = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'A test title value.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,7 +2354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36084
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_image_send_to_editor_defaults_with_optional_params() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_image_send_to_editor_defaults_with_optional_params() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::$large_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $caption = 'A test caption.';
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'A test title value.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2378,7 +2378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36084
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_image_send_to_editor_defaults_no_caption_no_rel() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_image_send_to_editor_defaults_no_caption_no_rel() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::$large_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $caption = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'A test title value.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2410,8 +2410,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36246
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_should_use_wp_get_attachment_metadata() {
- add_filter( 'wp_get_attachment_metadata', array( $this, '_filter_36246' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_should_use_wp_get_attachment_metadata() {
+ add_filter( 'wp_get_attachment_metadata', array( $this, 'filter_36246' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_all_filters( 'wp_calculate_image_sizes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2427,12 +2427,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_get_attachment_image( self::$large_id, 'testsize' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_get_attachment_metadata', array( $this, '_filter_36246' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_get_attachment_metadata', array( $this, 'filter_36246' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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">- function _filter_36246( $data, $attachment_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_36246( $data, $attachment_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['sizes']['testsize'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => 'test-image-testsize-999x999.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 999,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2445,7 +2445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50679
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_metadata_should_return_false_if_no_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_metadata_should_return_false_if_no_attachment() {
</ins><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"> $data = wp_get_attachment_metadata( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2473,7 +2473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_media_creation_timestamp_video_asf() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_media_creation_timestamp_video_asf() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fileformat' => 'asf',
</span><span class="cx" style="display: block; padding: 0 10px"> 'asf' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2489,7 +2489,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_media_creation_timestamp_video_matroska() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_media_creation_timestamp_video_matroska() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fileformat' => 'matroska',
</span><span class="cx" style="display: block; padding: 0 10px"> 'matroska' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2507,7 +2507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_media_creation_timestamp_video_quicktime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_media_creation_timestamp_video_quicktime() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fileformat' => 'quicktime',
</span><span class="cx" style="display: block; padding: 0 10px"> 'quicktime' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2527,7 +2527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_media_creation_timestamp_video_webm() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_media_creation_timestamp_video_webm() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fileformat' => 'webm',
</span><span class="cx" style="display: block; padding: 0 10px"> 'matroska' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2550,7 +2550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42017
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_read_audio_metadata_adds_creation_date_with_mp4() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_read_audio_metadata_adds_creation_date_with_mp4() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $video = DIR_TESTDATA . '/uploads/small-video.mp4';
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_read_audio_metadata( $video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2560,7 +2560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_read_video_metadata_adds_creation_date_with_quicktime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_read_video_metadata_adds_creation_date_with_quicktime() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $video = DIR_TESTDATA . '/uploads/small-video.mov';
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_read_video_metadata( $video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2570,7 +2570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_read_video_metadata_adds_creation_date_with_mp4() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_read_video_metadata_adds_creation_date_with_mp4() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $video = DIR_TESTDATA . '/uploads/small-video.mp4';
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_read_video_metadata( $video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2580,7 +2580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_read_video_metadata_adds_creation_date_with_mkv() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_read_video_metadata_adds_creation_date_with_mkv() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $video = DIR_TESTDATA . '/uploads/small-video.mkv';
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_read_video_metadata( $video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2590,7 +2590,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35218
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_read_video_metadata_adds_creation_date_with_webm() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_read_video_metadata_adds_creation_date_with_webm() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $video = DIR_TESTDATA . '/uploads/small-video.webm';
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_read_video_metadata( $video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2699,9 +2699,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50367
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_width_height() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_width_height() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $img_no_width_height = str_replace( ' width="' . $size_array[0] . '"', '', $img );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2746,9 +2746,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_loading_lazy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_loading_lazy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->get_image_size_array_from_meta( $image_meta, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $img_xhtml = str_replace( ' />', '/>', $img );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2802,7 +2802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_loading_lazy_opted_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_loading_lazy_opted_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $lazy_img = wp_img_tag_add_loading_attr( $img, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2832,7 +2832,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_filter_content_tags_loading_lazy_opted_out() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_content_tags_loading_lazy_opted_out() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2858,7 +2858,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50367
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_img_tag_add_loading_attr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_img_tag_add_loading_attr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = '<img src="example.png" alt=" width="300" height="225" />';
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_img_tag_add_loading_attr( $img, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2869,7 +2869,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50367
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_img_tag_add_loading_attr_without_src() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_img_tag_add_loading_attr_without_src() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = '<img alt=" width="300" height="225" />';
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_img_tag_add_loading_attr( $img, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2880,7 +2880,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50367
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_img_tag_add_loading_attr_with_single_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_img_tag_add_loading_attr_with_single_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = "<img src='example.png' alt=' width='300' height='225' />";
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_img_tag_add_loading_attr( $img, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2895,7 +2895,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50425
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_img_tag_add_loading_attr_opt_out() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_img_tag_add_loading_attr_opt_out() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = '<img src="example.png" alt=" width="300" height="225" />';
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_img_tag_add_loading_attr', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2905,7 +2905,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_iframe_tag_add_loading_attr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_iframe_tag_add_loading_attr() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iframe = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = wp_iframe_tag_add_loading_attr( $iframe, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2915,7 +2915,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_iframe_tag_add_loading_attr_without_src() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_iframe_tag_add_loading_attr_without_src() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iframe = '<iframe width="640" height="360"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = wp_iframe_tag_add_loading_attr( $iframe, 'test' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_iframe_tag_add_loading_attr_with_single_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_iframe_tag_add_loading_attr_with_single_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iframe = "<iframe src='https://www.example.com' width='640' height='360'></iframe>";
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = wp_iframe_tag_add_loading_attr( $iframe, 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2939,7 +2939,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50756
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_iframe_tag_add_loading_attr_opt_out() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_iframe_tag_add_loading_attr_opt_out() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iframe = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_iframe_tag_add_loading_attr', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = wp_iframe_tag_add_loading_attr( $iframe, 'test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2950,7 +2950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52768
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_iframe_tag_add_loading_attr_skip_wp_embed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_iframe_tag_add_loading_attr_skip_wp_embed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iframe = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $fallback = '<blockquote>Fallback content.</blockquote>';
</span><span class="cx" style="display: block; padding: 0 10px"> $iframe = wp_filter_oembed_result( $fallback . $iframe, (object) array( 'type' => 'rich' ), 'https://www.example.com' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2963,7 +2963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50425
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_loading() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_loading() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = wp_get_attachment_image( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( ' loading="lazy"', $img );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2973,7 +2973,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50425
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_loading_opt_out() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_loading_opt_out() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_lazy_loading_enabled', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_get_attachment_image( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2985,7 +2985,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44427
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50425
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_attachment_image_loading_opt_out_individual() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_attachment_image_loading_opt_out_individual() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The default is already tested above, the filter below ensures that
</span><span class="cx" style="display: block; padding: 0 10px"> // lazy-loading is definitely enabled globally for images.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_lazy_loading_enabled', '__return_true' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3005,7 +3005,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag_name Tag name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected return 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">- function test_wp_lazy_loading_enabled_tag_name_defaults( $tag_name, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_lazy_loading_enabled_tag_name_defaults( $tag_name, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_lazy_loading_enabled( $tag_name, 'the_content' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3013,7 +3013,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">- function data_wp_lazy_loading_enabled_tag_name_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_lazy_loading_enabled_tag_name_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'img => true' => array( 'img', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'iframe => true' => array( 'iframe', true ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3029,7 +3029,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Function context.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected return 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">- function test_wp_lazy_loading_enabled_context_defaults( $context, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_lazy_loading_enabled_context_defaults( $context, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_lazy_loading_enabled( 'img', $context ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3037,7 +3037,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">- function data_wp_lazy_loading_enabled_context_defaults() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_lazy_loading_enabled_context_defaults() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_get_attachment_image => true' => array( 'wp_get_attachment_image', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'the_content => true' => array( 'the_content', true ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3052,7 +3052,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50543
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_image_file_matches_image_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_image_file_matches_image_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src_full = wp_get_attachment_image_url( self::$large_id, 'full' );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src_medium = wp_get_attachment_image_url( self::$large_id, 'medium' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3064,7 +3064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50543
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_image_file_matches_image_meta_no_subsizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_image_file_matches_image_meta_no_subsizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = wp_get_attachment_image_url( self::$large_id, 'full' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3076,7 +3076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50543
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_image_file_matches_image_meta_invalid_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_image_file_matches_image_meta_invalid_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = ''; // Attachment is not an image.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = $this->img_url;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3086,7 +3086,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50543
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_image_file_matches_image_meta_different_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_image_file_matches_image_meta_different_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = $this->img_url; // Different image.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3096,7 +3096,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50543
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_image_file_matches_image_meta_original_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_image_file_matches_image_meta_original_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_src = wp_get_original_image_url( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3106,7 +3106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22101
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_gallery_shortcode_when_is_feed_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_gallery_shortcode_when_is_feed_true() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=rss2' );
</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"> * @param bool $expected_404 Whether the page is expected to return a 404 result.
</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">- function test_attachment_permalinks_based_on_parent_status( $post_key, $expected_url, $expected_404 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_permalinks_based_on_parent_status( $post_key, $expected_url, $expected_404 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( self::$post_ids[ $post_key ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3177,7 +3177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * $type bool $expected_404 Whether the page is expected to return a 404 result.
</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">- function data_attachment_permalinks_based_on_parent_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_attachment_permalinks_based_on_parent_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'draft-attachment', '/?attachment_id=%ID%', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish-attachment', '/publish-post/publish-attachment', false ),
</span></span></pre></div>
<a id="trunktestsphpunittestsmenunavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/menu/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/menu/nav-menu.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/menu/nav-menu.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set up.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unregister all nav menu locations.
</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"> * @param array $locations Location slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function register_nav_menu_locations( $locations ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function register_nav_menu_locations( $locations ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $locations as $location ) {
</span><span class="cx" style="display: block; padding: 0 10px"> register_nav_menu( $location, ucfirst( $location ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_one_location_each() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_one_location_each() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'unique-slug' => 1,
</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"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_registered_locations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_registered_locations() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary', 'secondary' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'primary' => 1,
</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"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_locations_with_same_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_locations_with_same_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary', 'secondary' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'primary' => 1,
</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"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_theme_previously_active() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_theme_previously_active() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_location_guessing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_location_guessing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary', 'secondary' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_location_guessing_one_menu_per_group() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_location_guessing_one_menu_per_group() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'top-menu' => 1,
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_location_guessing_one_menu_per_location() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_location_guessing_one_menu_per_location() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary', 'main' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_map_nav_menu_locations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_numerical_locations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_numerical_locations() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary', 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_theme_nav_menu_locations = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsmenuwalkernavmenueditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/menu/walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/menu/walker-nav-menu-edit.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/menu/walker-nav-menu-edit.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> class Tests_Menu_Walker_Nav_Menu_Edit extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $_wp_nav_menu_max_depth;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_nav_menu_max_depth;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</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"> $this->_wp_nav_menu_max_depth = $_wp_nav_menu_max_depth;
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_nav_menu_max_depth;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_nav_menu_max_depth = $this->_wp_nav_menu_max_depth;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36729
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_original_title_prefix_should_not_be_shown_if_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_original_title_prefix_should_not_be_shown_if_empty() {
</ins><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"> $post_id = $this->factory->post->create();
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaslashesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/meta/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/slashes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/meta/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$user_id = $factory->user->create();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</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"> * Tests the controller function that expects slashed 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">- function test_edit_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> if ( function_exists( 'wp_add_post_meta' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the legacy model function that expects slashed 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">- function test_add_post_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_post_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> add_post_meta( $post_id, 'slash_test_1', addslashes( $this->slash_1 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the legacy model function that expects slashed 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">- function test_update_post_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_post_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> update_post_meta( $post_id, 'slash_test_1', addslashes( $this->slash_1 ) );
</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"> * Tests the model function that expects slashed 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">- function test_add_comment_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_comment_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id = self::$comment_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comment_id, 'slash_test_1', $this->slash_1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_update_comment_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_comment_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id = self::$comment_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comment_id, 'slash_test_1', 'foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_add_user_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_user_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::$user_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( $user_id, 'slash_test_1', $this->slash_1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_update_user_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_user_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::$user_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( $user_id, 'slash_test_1', 'foo' );
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/meta.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Meta extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $updated_mids = 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meta_id = add_metadata( 'user', $this->author->ID, 'meta_key', 'meta_value' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,20 +13,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->delete_meta_id = add_metadata( 'user', $this->author->ID, 'delete_meta_key', 'delete_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">- function _meta_sanitize_cb( $meta_value, $meta_key, $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function meta_sanitize_cb( $meta_value, $meta_key, $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'sanitized';
</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">- function test_sanitize_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'unsanitized', $meta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_meta( 'post', 'some_meta', array( $this, '_meta_sanitize_cb' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta( 'post', 'some_meta', array( $this, 'meta_sanitize_cb' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'sanitized', $meta );
</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">- function test_delete_metadata_by_mid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_metadata_by_mid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Let's try and delete a non-existing ID, non existing meta.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( delete_metadata_by_mid( 'user', 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( delete_metadata_by_mid( 'non_existing_meta', $this->delete_meta_id ) );
</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"> $this->assertFalse( (bool) get_user_meta( $this->author->ID, 'delete_meta_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">- function test_update_metadata_by_mid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_metadata_by_mid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Setup.
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = get_metadata_by_mid( 'user', $this->meta_id );
</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"> }
</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">- function test_metadata_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_metadata_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( metadata_exists( 'user', $this->author->ID, 'foobarbaz' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( metadata_exists( 'user', $this->author->ID, 'meta_key' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( metadata_exists( 'user', 1234567890, 'foobarbaz' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_metadata_exists_with_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_metadata_exists_with_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Let's see if it returns the correct value when adding a filter.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_user_metadata', '__return_zero' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( metadata_exists( 'user', $this->author->ID, 'meta_key' ) ); // Existing meta key.
</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"> * @ticket 18158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_metadata_not_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_metadata_not_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $u = get_users(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</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">- function test_metadata_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_metadata_slashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 'Test\\singleslash';
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'Testsingleslash';
</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"> * @ticket 16814
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_meta_type_cast() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_meta_type_cast() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id1 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id1, 'num_as_longtext', 123 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id1, 'num_as_longtext_desc', 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 2, substr_count( $posts->request, 'CAST(' ) );
</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">- function test_meta_cache_order_asc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_meta_cache_order_asc() {
</ins><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"> $colors = array( 'red', 'blue', 'yellow', 'green' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $colors as $color ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28315
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_non_numeric_object_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_non_numeric_object_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_metadata( 'user', array( 1 ), 'meta_key', 'meta_value' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( update_metadata( 'user', array( 1 ), 'meta_key', 'meta_new_value' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( delete_metadata( 'user', array( 1 ), 'meta_key' ) );
</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"> * @ticket 28315
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_non_numeric_meta_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_non_numeric_meta_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_metadata_by_mid( 'user', array( 1 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( update_metadata_by_mid( 'user', array( 1 ), 'meta_new_value' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( delete_metadata_by_mid( 'user', array( 1 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_negative_meta_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_negative_meta_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $negative_mid = $this->meta_id * -1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertLessThan( 0, $negative_mid );
</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"> * @ticket 37746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_floating_meta_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_floating_meta_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $floating_mid = $this->meta_id + 0.1337;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( floor( $floating_mid ) !== $floating_mid );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_string_point_zero_meta_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_string_point_zero_meta_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_id = add_metadata( 'user', $this->author->ID, 'meta_key', 'meta_value_2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $string_mid = "{$meta_id}.0";
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitebootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/bootstrap.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/bootstrap.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param string $path The requested path.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $message The message to pass for failed tests.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_network_by_path( $expected_key, $domain, $path, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_network_by_path( $expected_key, $domain, $path, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $network = get_network_by_path( $domain, $path );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::$network_ids[ $expected_key ], $network->id, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain The requested domain.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path The requested 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">- function test_multisite_bootstrap( $site_key, $network_key, $domain, $path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multisite_bootstrap( $site_key, $network_key, $domain, $path ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_blog;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitecleanDirsizeCachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19879
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_dirsize_cache_in_recurse_dirsize_mock() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_dirsize_cache_in_recurse_dirsize_mock() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> delete_transient( 'dirsize_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the dirsize cache to our mock.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( 'dirsize_cache', $this->_get_mock_dirsize_cache_for_site( $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_transient( 'dirsize_cache', $this->get_mock_dirsize_cache_for_site( $blog_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_dir = wp_upload_dir();
</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"> * @ticket 19879
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_clean_dirsize_cache_file_input_mock() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clean_dirsize_cache_file_input_mock() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_transient( 'dirsize_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the dirsize cache to our mock.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( 'dirsize_cache', $this->_get_mock_dirsize_cache_for_site( $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_transient( 'dirsize_cache', $this->get_mock_dirsize_cache_for_site( $blog_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $cache_key_prefix . '/1/1', get_transient( 'dirsize_cache' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $cache_key_prefix . '/2/1', get_transient( 'dirsize_cache' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19879
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_clean_dirsize_cache_folder_input_mock() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clean_dirsize_cache_folder_input_mock() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</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"> delete_transient( 'dirsize_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the dirsize cache to our mock.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( 'dirsize_cache', $this->_get_mock_dirsize_cache_for_site( $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_transient( 'dirsize_cache', $this->get_mock_dirsize_cache_for_site( $blog_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $cache_key_prefix . '/1/1', get_transient( 'dirsize_cache' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $cache_key_prefix . '/2/1', get_transient( 'dirsize_cache' ) );
</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"> * @ticket 19879
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_dirsize_cache_in_recurse_dirsize_upload() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_dirsize_cache_in_recurse_dirsize_upload() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,20 +206,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19879
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_recurse_dirsize_filter() {
- add_filter( 'pre_recurse_dirsize', array( $this, '_filter_pre_recurse_dirsize' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_recurse_dirsize_filter() {
+ add_filter( 'pre_recurse_dirsize', array( $this, 'filter_pre_recurse_dirsize' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_dir = wp_upload_dir();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1042, recurse_dirsize( $upload_dir['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">- remove_filter( 'pre_recurse_dirsize', array( $this, '_filter_pre_recurse_dirsize' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_recurse_dirsize', array( $this, 'filter_pre_recurse_dirsize' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _filter_pre_recurse_dirsize() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_recurse_dirsize() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 1042;
</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">- function _get_mock_dirsize_cache_for_site( $site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_mock_dirsize_cache_for_site( $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $prefix = wp_upload_dir()['basedir'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</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"> * @ticket 51913
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_5_5_transient_structure_compat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_5_5_transient_structure_compat() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_transient( 'dirsize_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the dirsize cache to our mock.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( 'dirsize_cache', $this->_get_mock_5_5_dirsize_cache( $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_transient( 'dirsize_cache', $this->get_mock_5_5_dirsize_cache( $blog_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_dir = wp_upload_dir();
</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"> delete_transient( 'dirsize_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the dirsize cache to our mock.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( 'dirsize_cache', $this->_get_mock_5_5_dirsize_cache( $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_transient( 'dirsize_cache', $this->get_mock_5_5_dirsize_cache( $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"> * Now that the folder exists, the old cached value should be overwritten
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _get_mock_5_5_dirsize_cache( $site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_mock_5_5_dirsize_cache( $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $prefix = untrailingslashit( wp_upload_dir()['basedir'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetSpaceUsedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_GetSpaceUsed extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_space_used_switched_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_space_used_switched_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</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"> * Directories of sub sites on a network should not count against the same spaced used total for
</span><span class="cx" style="display: block; padding: 0 10px"> * the main site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_space_used_main_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_space_used_main_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $space_used = get_space_used();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,15 +76,15 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_space_used_pre_get_spaced_used_filter() {
- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_space_used_pre_get_spaced_used_filter() {
+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 300, get_space_used() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _filter_space_used() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_space_used() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 300;
</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="trunktestsphpunittestsmultisiteisUploadSpaceAvailablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> delete_option( 'blog_upload_space' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_site_option( 'blog_upload_space' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $available = is_upload_space_available();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $available );
</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"> update_site_option( 'blog_upload_space', 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'upload_space_check_disabled', 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">- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used_large' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used_large' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $available = is_upload_space_available();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_large' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used_large' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $available );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> public function test_is_upload_space_available_space_used_is_less_then_allowed() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blog_upload_space', 350 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $available = is_upload_space_available();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $available );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_upload_space_available_space_used_is_more_than_allowed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_upload_space_available_space_used_is_more_than_allowed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blog_upload_space', 350 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used_large' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used_large' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $available = is_upload_space_available();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_large' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used_large' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $available );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,31 +67,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * More comprehensive testing a 0 condition is handled in the tests
</span><span class="cx" style="display: block; padding: 0 10px"> * for `get_space_allowed()`. We cover one scenario here.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_upload_space_available_upload_space_0_defaults_to_100() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_upload_space_available_upload_space_0_defaults_to_100() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blog_upload_space', 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">- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $available = is_upload_space_available();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $available );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_upload_space_available_upload_space_negative() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_upload_space_available_upload_space_negative() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'blog_upload_space', -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">- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $available = is_upload_space_available();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used_small' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_get_space_used', array( $this, 'filter_space_used_small' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $available );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _filter_space_used_large() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_space_used_large() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 10000000;
</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">- function _filter_space_used_small() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_space_used_small() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 10;
</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="trunktestsphpunittestsmultisitemsFilesRewritingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/msFilesRewriting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/msFilesRewriting.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/msFilesRewriting.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_msFilesRewriting extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'ms_files_rewriting', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> ms_upload_constants();
</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">- function test_switch_upload_dir() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switch_upload_dir() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_main_site() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_current_site();
</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"> * that site should be removed. When wpmu_delete_blog() is run a second time, nothing
</span><span class="cx" style="display: block; padding: 0 10px"> * should change with upload directories.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_upload_directories_after_multiple_wpmu_delete_blog_with_ms_files() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_directories_after_multiple_wpmu_delete_blog_with_ms_files() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = __FUNCTION__ . '.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = __FUNCTION__ . '_contents';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/network.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected static $different_network_id;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $different_site_ids = 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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_site;
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site->id = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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"> * By default, only one network exists and has a network ID of 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">- function test_get_main_network_id_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_main_network_id_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, get_main_network_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If a second network is created, network ID 1 should still be returned
</span><span class="cx" style="display: block; padding: 0 10px"> * as the main network 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">- function test_get_main_network_id_two_networks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_main_network_id_two_networks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, get_main_network_id() );
</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"> * When the `$current_site` global is populated with another network, the
</span><span class="cx" style="display: block; padding: 0 10px"> * main network should still return as 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">- function test_get_main_network_id_after_network_switch() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_main_network_id_after_network_switch() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_site;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</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"> * @todo In the future, we'll have a smarter way of deleting a network. For now,
</span><span class="cx" style="display: block; padding: 0 10px"> * fake the process with UPDATE queries.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_main_network_id_after_network_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_main_network_id_after_network_delete() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $current_site;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $temp_id = self::$different_network_id + 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,13 +115,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::$different_network_id, $main_network_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">- function test_get_main_network_id_filtered() {
- add_filter( 'get_main_network_id', array( $this, '_get_main_network_id' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_main_network_id_filtered() {
+ add_filter( 'get_main_network_id', array( $this, 'get_main_network_id' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, get_main_network_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'get_main_network_id', array( $this, '_get_main_network_id' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'get_main_network_id', array( $this, 'get_main_network_id' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _get_main_network_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_main_network_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 3;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37050
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_network_object_id_property_is_int() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_network_object_id_property_is_int() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $network = WP_Network::get_instance( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22917
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_enable_live_network_user_counts_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enable_live_network_user_counts_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // False for large networks by default.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'enable_live_network_counts', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'enable_live_network_counts', '__return_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">- function test_active_network_plugins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_active_network_plugins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = 'hello.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Local activate, should be invisible for the network.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $active_plugins = wp_get_active_network_plugins();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $active_plugins );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'deactivated_plugin', array( $this, '_helper_deactivate_hook' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'deactivated_plugin', array( $this, 'helper_deactivate_hook' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Activate the plugin sitewide.
</span><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( $path, '', true ); // Enable the plugin for all sites in the network.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28651
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_duplicate_network_active_plugin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_duplicate_network_active_plugin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = 'hello.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $mock = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'activate_' . $path, array( $mock, 'action' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,21 +305,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'activate_' . $path, array( $mock, 'action' ) );
</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">- function test_is_plugin_active_for_network_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_plugin_active_for_network_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( 'hello.php', '', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_plugin_active_for_network( 'hello.php' ) );
</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">- function test_is_plugin_active_for_network_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_plugin_active_for_network_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( 'hello.php', false, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_plugin_active_for_network( 'hello.php' ) );
</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">- function _helper_deactivate_hook() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function helper_deactivate_hook() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->plugin_hook_count++;
</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">- function test_get_user_count() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_user_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Refresh the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_network_counts();
</span><span class="cx" style="display: block; padding: 0 10px"> $start_count = get_user_count();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'enable_live_network_counts', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_schedule_update_network_counts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_schedule_update_network_counts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_next_scheduled( 'update_network_counts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We can't use wp_schedule_update_network_counts() because WP_INSTALLING is set.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_dashboard_blog
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_dashboard_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_dashboard_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If there is no dashboard blog set, current blog is used.
</span><span class="cx" style="display: block; padding: 0 10px"> $dashboard_blog = get_dashboard_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $dashboard_blog->blog_id );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37528
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_network_site_counts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_network_site_counts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_network_option( null, 'blog_count', 40 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = get_sites(
</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"> * @ticket 37528
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_network_site_counts_on_different_network() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_network_site_counts_on_different_network() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_network_option( self::$different_network_id, 'blog_count', 40 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_network_site_counts( self::$different_network_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/site.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,13 +17,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $site_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $uninitialized_site_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->suppress = $wpdb->suppress_errors();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $this->suppress );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_switch_restore_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switch_restore_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_switched_stack, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $_wp_switched_stack );
</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"> * Test the cache keys and database tables setup through the creation of a site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_created_site_details() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_created_site_details() {
</ins><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"> $blog_id = self::factory()->blog->create();
</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><span class="cx" style="display: block; padding: 0 10px"> * When a site is flagged as 'deleted', its data should be cleared from cache.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</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"> * When a site is flagged as 'deleted', its data should remain in the database.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
</ins><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"> $blog_id = self::factory()->blog->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * When a site is fully deleted, its data should be cleared from cache.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</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"> * When a site is fully deleted, its data should be removed from the database.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
</ins><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"> $blog_id = self::factory()->blog->create();
</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"> * When the main site of a network is fully deleted, its data should be cleared from cache.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_in_cache_after_wpmu_delete_blog_main_site_drop_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_in_cache_after_wpmu_delete_blog_main_site_drop_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = 1; // The main site in our test suite has an ID of 1.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * When the main site of a network is fully deleted, its data should remain in the database.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_data_in_tables_after_wpmu_delete_blog_main_site_drop_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_data_in_tables_after_wpmu_delete_blog_main_site_drop_true() {
</ins><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"> $blog_id = 1; // The main site in our test suite has an ID of 1.
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The site count of a network should change when a site is flagged as 'deleted'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_network_count_after_wpmu_delete_blog_drop_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_network_count_after_wpmu_delete_blog_drop_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site without forcing a table drop.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The site count of a network should change when a site is fully deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_blog_count_after_wpmu_delete_blog_drop_true() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_blog_count_after_wpmu_delete_blog_drop_true() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site and force a table drop.
</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"> * that site should be removed. When wpmu_delete_blog() is run a second time, nothing
</span><span class="cx" style="display: block; padding: 0 10px"> * should change with upload directories.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_upload_directories_after_multiple_wpmu_delete_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_directories_after_multiple_wpmu_delete_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = __FUNCTION__ . '.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = __FUNCTION__ . '_contents';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileDoesNotExist( $file2['file'] );
</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">- function test_wpmu_update_blogs_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wpmu_update_blogs_date() {
</ins><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"> wpmu_update_blogs_date();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Provide a counter to determine that hooks are firing when intended.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _action_counter_cb() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_counter_cb() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23405
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_details_when_site_does_not_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_details_when_site_does_not_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create an unused site so that we can then assume an invalid site ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id++;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Updating a field returns the sme value that was passed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_status( 1, 'spam', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,12 +459,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Updating an invalid field returns the same value that was passed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_invalid_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_invalid_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_status( 1, 'doesnotexist', 'invalid' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'invalid', $result );
</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">- function test_update_blog_status_make_ham_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_make_ham_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'spam' => 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">- add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'make_ham_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'spam', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,10 +485,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '0', $blog->spam );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_ham_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_content_from_spam_blog_is_not_available() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_content_from_spam_blog_is_not_available() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $spam_blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $spam_blog_id );
</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">@@ -518,13 +518,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringNotContainsString( "src=\"{$spam_embed_url}#?", $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">- function test_update_blog_status_make_spam_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_make_spam_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'make_spam_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'spam', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,16 +538,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '1', $blog->spam );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_spam_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_archive_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_archive_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'archive_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'archived', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,10 +561,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '1', $blog->archived );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'archive_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_unarchive_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_unarchive_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +571,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'archived' => 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">- add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'unarchive_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'archived', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,16 +584,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '0', $blog->archived );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'unarchive_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_make_delete_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_make_delete_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'make_delete_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,10 +607,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '1', $blog->deleted );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_delete_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_make_undelete_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_make_undelete_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,7 +617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'deleted' => 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">- add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'make_undelete_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,16 +631,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '0', $blog->deleted );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_undelete_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_mature_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_mature_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'mature_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'mature', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,10 +654,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '1', $blog->mature );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'mature_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_unmature_blog_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_unmature_blog_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,7 +664,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'mature' => 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">- add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'unmature_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'mature', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,16 +678,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '0', $blog->mature );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'unmature_blog', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_status_update_blog_public_action() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_status_update_blog_public_action() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'update_blog_public', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'update_blog_public', array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'public', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,13 +701,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '0', $blog->public );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'update_blog_public', array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'update_blog_public', array( $this, 'action_counter_cb' ), 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27952
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_posts_count() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_posts_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post2 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 2, get_site()->post_count );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,7 +719,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26410
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_blog_details_cache_invalidation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_blog_details_cache_invalidation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blogname', 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( get_current_blog_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $details->blogname );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,7 +733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the original and cached responses for a created and then deleted site when
</span><span class="cx" style="display: block; padding: 0 10px"> * the blog ID is requested through get_blog_id_from_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">- function test_get_blog_id_from_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_id_from_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,7 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the case insensitivity of the site lookup.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_id_from_url_is_case_insensitive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_id_from_url_is_case_insensitive() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => 'example.com',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,7 +761,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the first and cached responses for a site that does not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_id_from_url_that_does_not_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_id_from_url_that_does_not_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'path' => '/xyz' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,7 +773,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A blog ID is still available if only the `deleted` flag is set for a site. The same
</span><span class="cx" style="display: block; padding: 0 10px"> * behavior would be expected if passing `false` explicitly to `wpmu_delete_blog()`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_id_from_url_with_deleted_flag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_id_from_url_with_deleted_flag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,7 +787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When deleted with the drop parameter as true, the cache will first be false, then set to
</span><span class="cx" style="display: block; padding: 0 10px"> * -1 after an attempt at `get_blog_id_from_url()` is made.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_id_from_url_after_dropped() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_id_from_url_after_dropped() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,7 +801,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test with default parameter of site_id as null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_main_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_main_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_main_site() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,7 +809,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test with a site id of get_current_blog_id(), which should be the same as the
</span><span class="cx" style="display: block; padding: 0 10px"> * default parameter tested above.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_current_blog_id_is_main_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_current_blog_id_is_main_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_main_site( get_current_blog_id() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,7 +816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test with a site ID other than the main site to ensure a false 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">- function test_is_main_site_is_false_with_other_blog_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_main_site_is_false_with_other_blog_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_main_site( $blog_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,7 +825,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test with no passed ID after switching to another site 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">- function test_is_main_site_is_false_after_switch_to_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_main_site_is_false_after_switch_to_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +834,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_switch_upload_dir() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switch_upload_dir() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_main_site() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_current_site();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -867,7 +867,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the primary purpose of get_blog_post(), to retrieve a post from
</span><span class="cx" style="display: block; padding: 0 10px"> * another site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_post_from_another_site_on_network() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_post_from_another_site_on_network() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(); // Create a post on the primary site, ID 1.
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -882,7 +882,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * If get_blog_post() is used on the same site, it should still work.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_post_from_same_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_post_from_same_site() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_blog_post( 1, $post_id ), get_post( $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,7 +891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A null response should be returned if an invalid post is requested.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blog_post_invalid_returns_null() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blog_post_invalid_returns_null() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( get_blog_post( 1, 999999 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,7 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Added as a callback to the domain_exists filter to provide manual results for
</span><span class="cx" style="display: block; padding: 0 10px"> * the testing of the filter and for a test which does not need the database.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _domain_exists_cb( $exists, $domain, $path, $site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function domain_exists_cb( $exists, $domain, $path, $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'foo' === $domain && 'bar/' === $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 1234;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,13 +907,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_domain_exists_with_default_site_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_domain_exists_with_default_site_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, domain_exists( $details->domain, $details->path ) );
</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">- function test_domain_exists_with_specified_site_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_domain_exists_with_specified_site_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, domain_exists( $details->domain, $details->path, $details->site_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,20 +923,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When the domain is valid, but the resulting site does not belong to the specified network,
</span><span class="cx" style="display: block; padding: 0 10px"> * it is marked as not existing.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_domain_does_not_exist_with_invalid_site_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_domain_does_not_exist_with_invalid_site_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_site( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( domain_exists( $details->domain, $details->path, 999 ) );
</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">- function test_invalid_domain_does_not_exist_with_default_site_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_domain_does_not_exist_with_default_site_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( domain_exists( 'foo', 'bar' ) );
</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">- function test_domain_filtered_to_exist() {
- add_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_domain_filtered_to_exist() {
+ add_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $exists = domain_exists( 'foo', 'bar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1234, $exists );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,11 +944,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When a path is passed to domain_exists, it is immediately trailing slashed. A path
</span><span class="cx" style="display: block; padding: 0 10px"> * value with or without the slash should result in the same return 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">- function test_slashed_path_in_domain_exists() {
- add_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_slashed_path_in_domain_exists() {
+ add_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $exists1 = domain_exists( 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $exists2 = domain_exists( 'foo', 'bar/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'domain_exists', array( $this, 'domain_exists_cb' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the same result is returned with or without a trailing slash.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $exists1, $exists2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,7 +957,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests returning an address for a given valid 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">- function test_get_blogaddress_by_id_with_valid_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blogaddress_by_id_with_valid_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogaddress = get_blogaddress_by_id( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/', $blogaddress );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,7 +965,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests returning the appropriate response for a invalid id given.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blogaddress_by_id_with_invalid_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blogaddress_by_id_with_invalid_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogaddress = get_blogaddress_by_id( 42 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $blogaddress );
</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"> * @ticket 14867
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blogaddress_by_id_scheme_reflects_blog_scheme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blogaddress_by_id_scheme_reflects_blog_scheme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http', parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -986,7 +986,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14867
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blogaddress_by_id_scheme_is_unaffected_by_request() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blogaddress_by_id_scheme_is_unaffected_by_request() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_ssl() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1005,7 +1005,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33620
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_new_blog_url_schemes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_blog_url_schemes( $home_scheme, $siteurl_scheme, $force_ssl_admin ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_blog_url_schemes( $home_scheme, $siteurl_scheme, $force_ssl_admin ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_site = get_current_site();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $home = get_option( 'home' );
</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"> $this->assertSame( $siteurl_scheme, parse_url( get_blog_option( $new, 'siteurl' ), PHP_URL_SCHEME ) );
</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">- function data_new_blog_url_schemes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_new_blog_url_schemes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'https',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,7 +1064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36918
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_blog_locale() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_blog_locale() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_site = get_current_site();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1099,7 +1099,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40503
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_different_network_language() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_different_network_language() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $network = get_network( self::$network_ids['make.wordpress.org/'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $original_value The original value passed to the function.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The orginal 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">- function filter_allow_unavailable_languages( $value, $option, $original_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_allow_unavailable_languages( $value, $option, $original_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $original_value;
</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="trunktestsphpunittestsmultisiteupdateBlogDetailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/updateBlogDetails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * If `update_blog_details()` is called with any kind of empty arguments, it
</span><span class="cx" style="display: block; padding: 0 10px"> * should return 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">- function test_update_blog_details_with_empty_args() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_details_with_empty_args() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_details( 1, array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,12 +19,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * If the ID passed is not that of a current site, we should expect 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">- function test_update_blog_details_invalid_blog_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_details_invalid_blog_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_details( 999, array( 'domain' => 'example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</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">- function test_update_blog_details() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_details() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_details(
</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"> update_blog_details( $blog_id, array( $flag => '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">- add_action( $hook, array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( $hook, array( $this, 'action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( $flag => $flag_value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( $blog_id );
</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"> // The hook attached to this flag should not have fired again.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( $hook, array( $this, '_action_counter_cb' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( $hook, array( $this, 'action_counter_cb' ), 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 data_flag_hooks() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Provide a counter to determine that hooks are firing when intended.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _action_counter_cb() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_counter_cb() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitewpMsSitesListTablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/wpMsSitesListTable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/wpMsSitesListTable.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite/wpMsSitesListTable.php 2021-11-04 15:22:47 UTC (rev 52010)
</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 $table = 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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->table = _get_list_table( 'WP_MS_Sites_List_Table', array( 'screen' => 'ms-sites' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/multisite.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wpmu_log_new_registrations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wpmu_log_new_registrations() {
</ins><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"> $user = new WP_User( 1 );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37392
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_count_sites() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_sites() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a random number of sites with each status.
</span><span class="cx" style="display: block; padding: 0 10px"> $site_ids = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => self::factory()->blog->create_many(
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/controller.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> return $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">- function test_wp_oembed_ensure_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_oembed_ensure_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'json', wp_oembed_ensure_format( 'json' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'xml', wp_oembed_ensure_format( 'xml' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'json', wp_oembed_ensure_format( 123 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'json', wp_oembed_ensure_format( array() ) );
</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">- function test_oembed_create_xml() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_create_xml() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = _oembed_create_xml(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</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"> $this->assertArrayHasKey( 'args', $proxy_route[0] );
</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">- function test_request_with_wrong_method() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_with_wrong_method() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', '/oembed/1.0/embed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</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"> $this->assertSame( 'rest_no_route', $data['code'] );
</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">- function test_request_without_url_param() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_without_url_param() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/oembed/1.0/embed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'url', $data['data']['params'][0] );
</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">- function test_request_with_bad_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_with_bad_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/oembed/1.0/embed' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'url', 'http://google.com/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'oembed_invalid_url', $data['code'] );
</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">- function test_request_invalid_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_invalid_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/oembed/1.0/embed' );
</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"> $this->assertNotEmpty( $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">- function test_request_json() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_json() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_request_static_front_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_static_front_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Front page',
</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"> 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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_request_xml() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_xml() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</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"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_request_ms_child_in_root_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_request_ms_child_in_root_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $child = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $child );
</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"> restore_current_blog();
</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">- function test_rest_pre_serve_request() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_pre_serve_request() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = $this->factory()->user->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'SimpleXMLElement', $xml );
</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">- function test_rest_pre_serve_request_wrong_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_pre_serve_request_wrong_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = $this->factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/oembed/1.0/embed' );
</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->assertTrue( _oembed_rest_pre_serve_request( true, $response, $request, rest_get_server() ) );
</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">- function test_rest_pre_serve_request_wrong_method() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_pre_serve_request_wrong_method() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = $this->factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'HEAD', '/oembed/1.0/embed' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,7 +508,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( _oembed_rest_pre_serve_request( true, $response, $request, rest_get_server() ) );
</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">- function test_get_oembed_endpoint_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_endpoint_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url() . '/index.php?rest_route=/oembed/1.0/embed', get_oembed_endpoint_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url() . '/index.php?rest_route=/oembed/1.0/embed', get_oembed_endpoint_url( '', 'json' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url() . '/index.php?rest_route=/oembed/1.0/embed', get_oembed_endpoint_url( '', 'xml' ) );
</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"> $this->assertSame( home_url() . '/index.php?rest_route=%2Foembed%2F1.0%2Fembed&url=' . $url_encoded . '&format=xml', get_oembed_endpoint_url( $url, 'xml' ) );
</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">- function test_get_oembed_endpoint_url_pretty_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_endpoint_url_pretty_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'permalink_structure', '/%postname%' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url() . '/wp-json/oembed/1.0/embed', get_oembed_endpoint_url() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45142
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_proxy_with_internal_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_proxy_with_internal_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get(
</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"> * @ticket 45142
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_proxy_with_static_front_page_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_proxy_with_static_front_page_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span></span></pre></div>
<a id="trunktestsphpunittestsoembeddiscoveryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/discovery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/discovery.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/discovery.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,11 +4,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group oembed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_oEmbed_Discovery extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_oembed_discovery_links_non_singular() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_oembed_discovery_links_non_singular() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_echo( 'wp_oembed_add_discovery_links' ) );
</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">- function test_add_oembed_discovery_links_front_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_oembed_discovery_links_front_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_echo( 'wp_oembed_add_discovery_links' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, url_to_postid( home_url() ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_oembed_discovery_links_static_front_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_oembed_discovery_links_static_front_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_on_front',
</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"> 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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_oembed_discovery_links_to_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_oembed_discovery_links_to_post() {
</ins><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"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_single', 'is_singular' );
</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"> $this->assertSame( $expected, get_echo( 'wp_oembed_add_discovery_links' ) );
</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">- function test_add_oembed_discovery_links_to_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_oembed_discovery_links_to_page() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, get_echo( 'wp_oembed_add_discovery_links' ) );
</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">- function test_add_oembed_discovery_links_to_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_oembed_discovery_links_to_attachment() {
</ins><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"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedfilterResultphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/filterResult.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/filterResult.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/filterResult.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group oembed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Filter_oEmbed_Result extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_oembed_result_trusted_malicious_iframe() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_trusted_malicious_iframe() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<p></p><iframe onload="alert(1)"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), 'https://www.youtube.com/watch?v=72xdCU__XCk' );
</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"> $this->assertSame( $html, $actual );
</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">- function test_filter_oembed_result_with_untrusted_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_with_untrusted_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<p></p><iframe onload="alert(1)" src="http://example.com/sample-page/"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), 'http://example.com/sample-page/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $matches[1], $matches[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">- function test_filter_oembed_result_only_one_iframe_is_allowed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_only_one_iframe_is_allowed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<div><iframe></iframe><iframe></iframe><p></p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</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"> $this->assertSame( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</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">- function test_filter_oembed_result_with_newlines() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_with_newlines() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = <<<EOD
</span><span class="cx" style="display: block; padding: 0 10px"> <script>var = 1;</script>
</span><span class="cx" style="display: block; padding: 0 10px"> <iframe></iframe>
</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"> $this->assertSame( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</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">- function test_filter_oembed_result_without_iframe() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_without_iframe() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<span>Hello</span><p>World</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</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"> $this->assertFalse( $actual );
</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">- function test_filter_oembed_result_secret_param_available() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_secret_param_available() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<iframe src="https://wordpress.org"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,18 +68,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $matches[1], $matches[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">- function test_filter_oembed_result_wrong_type_provided() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_wrong_type_provided() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( 'some string', (object) array( 'type' => 'link' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'some string', $actual );
</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">- function test_filter_oembed_result_invalid_result() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_invalid_result() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_filter_oembed_result( false, (object) array( 'type' => 'rich' ), '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_filter_oembed_result( '', (object) array( 'type' => 'rich' ), '' ) );
</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">- function test_filter_oembed_result_blockquote_adds_style_to_iframe() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_blockquote_adds_style_to_iframe() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<blockquote></blockquote><iframe></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"></iframe>', $actual );
</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">- function test_filter_oembed_result_allowed_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_oembed_result_allowed_html() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<blockquote class="foo" id="bar"><strong><a href="" target=""></a></strong></blockquote><iframe></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group feed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_feed_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_feed_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = '<blockquote></blockquote><iframe></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = _oembed_filter_feed_content( wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedgetResponseDataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/getResponseData.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/getResponseData.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/getResponseData.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::touch( ABSPATH . WPINC . '/js/wp-embed.js' );
</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">- function test_get_oembed_response_data_non_existent_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_non_existent_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_oembed_response_data( 0, 100 ) );
</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">- function test_get_oembed_response_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Some Post',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test get_oembed_response_data with an author.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_oembed_response_data_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_oembed_response_link() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_link() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'oembed_response_data', 'get_oembed_response_data_rich' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</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"> add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
</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">- function test_get_oembed_response_data_with_draft_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_draft_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'draft',
</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"> $this->assertFalse( get_oembed_response_data( $post, 100 ) );
</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">- function test_get_oembed_response_data_with_scheduled_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_scheduled_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'future',
</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->assertFalse( get_oembed_response_data( $post, 100 ) );
</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">- function test_get_oembed_response_data_with_private_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_private_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'private',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47574
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_oembed_response_data_with_public_true_custom_post_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_public_true_custom_post_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Custom status with 'public' => true.
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47574
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_oembed_response_data_with_public_false_custom_post_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_public_false_custom_post_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Custom status with 'public' => false.
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'private_foo', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47574
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_oembed_response_data_with_unregistered_custom_post_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_unregistered_custom_post_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'unknown_foo',
</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"> $this->assertFalse( get_oembed_response_data( $post, 100 ) );
</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">- function test_get_oembed_response_data_maxwidth_too_high() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_maxwidth_too_high() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post, 1000 );
</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->assertSame( 338, $data['height'] );
</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">- function test_get_oembed_response_data_maxwidth_too_low() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_maxwidth_too_low() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post, 100 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 200, $data['height'] );
</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">- function test_get_oembed_response_data_maxwidth_invalid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_maxwidth_invalid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post, '400;" DROP TABLES' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 200, $data['height'] );
</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">- function test_get_oembed_response_data_with_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_with_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 400 >= $data['thumbnail_width'] );
</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">- function test_get_oembed_response_data_for_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_oembed_response_data_for_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->attachment->create_object(
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedheadersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/headers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/headers.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/headers.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function xdebug_get_headers
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_rest_pre_serve_request_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_pre_serve_request_headers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = $this->factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedpostEmbedUrlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/postEmbedUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/postEmbedUrl.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/postEmbedUrl.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,12 +4,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group oembed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Embed_URL extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_non_existent_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_non_existent_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $embed_url = get_post_embed_url( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $embed_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">- function test_with_pretty_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_with_pretty_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%' );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink . '/embed', $embed_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">- function test_with_ugly_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_with_ugly_permalinks() {
</ins><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"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $embed_url = get_post_embed_url( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_static_front_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_static_front_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</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( array( 'post_type' => 'page' ) );
</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"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_static_front_page_with_ugly_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_static_front_page_with_ugly_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</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"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_conflicts_with_embed_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_conflicts_with_embed_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_page = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_static_front_page_conflicts_with_embed_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_static_front_page_conflicts_with_embed_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a post with the 'embed' post_name.
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/template.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/oembed/template.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group oembed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Embed_Template extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_oembed_output_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</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"> $this->assertStringContainsString( 'Hello World', $actual );
</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">- function test_oembed_output_post_with_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_post_with_thumbnail() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</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"> $this->assertStringContainsString( 'canola.jpg', $actual );
</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">- function test_oembed_output_404() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_404() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( '/?p=123&embed=true' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_query']->query_vars['embed'] = true;
</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"> $this->assertStringContainsString( 'That embed can’t be found.', $actual );
</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">- function test_oembed_output_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</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"> $this->assertStringContainsString( 'canola.jpg', $actual );
</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">- function test_oembed_output_draft_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_draft_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</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"> $this->assertStringContainsString( 'That embed can’t be found.', $actual );
</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">- function test_oembed_output_scheduled_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_scheduled_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</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"> $this->assertStringContainsString( 'That embed can’t be found.', $actual );
</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">- function test_oembed_output_private_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_private_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'That embed can’t be found.', $actual );
</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">- function test_oembed_output_private_post_with_permissions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_oembed_output_private_post_with_permissions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'editor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,13 +211,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'Hello World', $actual );
</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">- function test_wp_embed_excerpt_more_no_embed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_embed_excerpt_more_no_embed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_query'] = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo bar', wp_embed_excerpt_more( 'foo bar' ) );
</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">- function test_wp_embed_excerpt_more() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_embed_excerpt_more() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Foo Bar',
</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"> $this->assertSame( $expected, $actual );
</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">- function test_is_embed_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_embed_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_embed() );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_embed() );
</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">- function test_is_embed_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_embed_attachment() {
</ins><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"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,17 +261,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_embed() );
</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">- function test_is_embed_404() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_embed_404() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( '/?p=12345&embed=true' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_embed() );
</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">- function test_get_post_embed_html_non_existent_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_embed_html_non_existent_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_post_embed_html( 200, 200, 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_post_embed_html( 200, 200 ) );
</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">- function test_get_post_embed_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_embed_html() {
</ins><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"> $title = esc_attr(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</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"> $this->assertStringEndsWith( $expected, get_post_embed_html( 200, 200, $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">- function test_add_host_js() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_host_js() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_oembed_add_host_js();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_script_is( 'wp-embed' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34698
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_js_no_ampersands() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_js_no_ampersands() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringNotContainsString( '&', file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' ) );
</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="trunktestsphpunittestsoptionmultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/multisite.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/multisite.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> class Tests_Multisite_Option extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_from_same_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_from_same_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $key2 = __FUNCTION__ . '_2';
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__ . '_val1';
</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"> $this->assertFalse( get_option( $key2 ) ); // Check get_option().
</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">- function test_from_same_site_with_null_blog_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_from_same_site_with_null_blog_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $key2 = __FUNCTION__ . '_2';
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__ . '_val1';
</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"> $this->assertFalse( get_option( $key2 ) ); // Check get_option().
</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">- function test_with_another_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_with_another_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( $user_id );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_site_notoptions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_site_notoptions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $network_id = get_current_network_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions_key = "{$network_id}:notoptions";
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertNotEmpty( $notoptions1 );
</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">- function test_users_can_register_signup_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_users_can_register_signup_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $registration = get_site_option( 'registration' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( users_can_register_signup_filter() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,12 +169,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_illegal_names
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_network_option_illegal_names( $option_value, $sanitized_option_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_network_option_illegal_names( $option_value, $sanitized_option_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'illegal_names', $option_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $sanitized_option_value, get_site_option( 'illegal_names' ) );
</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">- function data_illegal_names() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_illegal_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( '', 'Woo', '' ), array( 'Woo' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'foo bar', array( 'foo', 'bar' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $option_value
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $sanitized_option_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">- function test_sanitize_network_option_limited_email_domains( $option_value, $sanitized_option_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_network_option_limited_email_domains( $option_value, $sanitized_option_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'limited_email_domains', $option_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $sanitized_option_value, get_site_option( 'limited_email_domains' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,12 +199,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $option_value
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $sanitized_option_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">- function test_sanitize_network_option_banned_email_domains( $option_value, $sanitized_option_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_network_option_banned_email_domains( $option_value, $sanitized_option_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'banned_email_domains', $option_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $sanitized_option_value, get_site_option( 'banned_email_domains' ) );
</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">- function data_email_domains() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_email_domains() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 'woo', '', 'boo.com', 'foo.net.biz..' ), array( 'woo', 'boo.com' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( "foo\nbar", array( 'foo', 'bar' ) ),
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionnetworkOptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/networkOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/networkOption.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/networkOption.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_network_option_not_available_on_other_network() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_network_option_not_available_on_other_network() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</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"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_network_option_available_on_same_network() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_network_option_available_on_same_network() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</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"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_delete_network_option_on_only_one_network() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_network_option_on_only_one_network() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</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"> * @param $network_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $expected_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">- function test_add_network_option_network_id_parameter( $network_id, $expected_response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_network_option_network_id_parameter( $network_id, $expected_response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,13 +97,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $network_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $expected_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">- function test_get_network_option_network_id_parameter( $network_id, $expected_response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_network_option_network_id_parameter( $network_id, $expected_response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_response, get_network_option( $network_id, $option, 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">- function data_network_id_parameter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_network_id_parameter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Numeric values should always be accepted.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, true ),
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/option.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/option.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,11 +5,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Option_Option extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __return_foo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __return_foo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">- function test_the_basics() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_basics() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'key1';
</span><span class="cx" style="display: block; padding: 0 10px"> $key2 = 'key2';
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 'value1';
</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"> $this->assertFalse( get_option( $key2 ) );
</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">- function test_default_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = 'value';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_option( 'doesnotexist' ) );
</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"> $this->assertSame( 'bar', get_option( 'doesnotexist' ) );
</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">- function test_serialized_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => true,
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23289
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_special_option_name_alloption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_special_option_name_alloption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectException( 'WPDieException' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'alloptions' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,12 +219,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23289
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_special_option_name_notoptions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_special_option_name_notoptions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectException( 'WPDieException' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'notoptions' );
</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">- function data_option_autoloading() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_option_autoloading() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'autoload_yes', 'yes', 'yes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'autoload_true', true, 'yes' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31119
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_option_autoloading
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_option_autoloading( $name, $autoload_value, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_option_autoloading( $name, $autoload_value, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $added = add_option( $name, 'Autoload test', '', $autoload_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $added );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsiteOptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/siteOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/siteOption.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/siteOption.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,15 +4,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group option
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Option_SiteOption extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __return_foo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __return_foo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">- function test_get_site_option_returns_false_if_option_does_not_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_returns_false_if_option_does_not_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_site_option( 'doesnotexist' ) );
</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">- function test_get_site_option_returns_false_after_deletion() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_returns_false_after_deletion() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</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"> $this->assertFalse( get_site_option( $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">- function test_get_site_option_returns_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_returns_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</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"> $this->assertSame( $value, get_site_option( $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">- function test_get_site_option_returns_updated_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_returns_updated_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $new_value = __FUNCTION__ . '_2';
</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"> $this->assertSame( $new_value, get_site_option( $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">- function test_get_site_option_does_not_exist_returns_filtered_default_with_no_default_provided() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_does_not_exist_returns_filtered_default_with_no_default_provided() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_option = get_site_option( 'doesnotexist' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
</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"> $this->assertSame( 'foo', $site_option );
</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">- function test_get_site_option_does_not_exist_returns_filtered_default_with_default_provided() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_does_not_exist_returns_filtered_default_with_default_provided() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_option = get_site_option( 'doesnotexist', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,11 +50,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $site_option );
</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">- function test_get_site_option_does_not_exist_returns_provided_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_does_not_exist_returns_provided_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'bar', get_site_option( 'doesnotexist', 'bar' ) );
</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">- function test_get_site_option_exists_does_not_return_provided_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_exists_does_not_return_provided_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</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"> $this->assertSame( $value, get_site_option( $key, '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">- function test_get_site_option_exists_does_not_return_filtered_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_site_option_exists_does_not_return_filtered_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,13 +71,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $value, $site_option );
</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">- function test_add_site_option_returns_true_for_new_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_site_option_returns_true_for_new_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( add_site_option( $key, $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">- function test_add_site_option_returns_false_for_existing_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_site_option_returns_false_for_existing_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</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"> $this->assertFalse( add_site_option( $key, $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">- function test_update_site_option_returns_false_for_same_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_site_option_returns_false_for_same_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( update_site_option( $key, $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">- function test_update_site_option_returns_true_for_new_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_site_option_returns_true_for_new_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'key';
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 'value1';
</span><span class="cx" style="display: block; padding: 0 10px"> $new_value = 'value2';
</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->assertTrue( update_site_option( $key, $new_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">- function test_delete_site_option_returns_true_if_option_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_site_option_returns_true_if_option_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( delete_site_option( $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">- function test_delete_site_option_returns_false_if_option_does_not_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_site_option_returns_false_if_option_does_not_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</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"> $this->assertFalse( delete_site_option( $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">- function test_site_option_add_and_get_serialized_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_site_option_add_and_get_serialized_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => true,
</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"> $this->assertSame( $value, get_site_option( $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">- function test_site_option_add_and_get_serialized_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_site_option_add_and_get_serialized_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $value->foo = true;
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15497
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_adds_falsey_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_adds_falsey_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 0;
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18955
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_doesnt_cache_default_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_doesnt_cache_default_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $default = 'a default';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsiteTransientphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/siteTransient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/siteTransient.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/siteTransient.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_basics() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_basics() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'key1';
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 'value1';
</span><span class="cx" style="display: block; padding: 0 10px"> $value2 = 'value2';
</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"> $this->assertFalse( delete_site_transient( $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">- function test_serialized_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => true,
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionslashesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/slashes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Option_Slashes extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // It is important to test with both even and odd numbered slashes,
</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"> * Tests the model function that expects un-slashed 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">- function test_add_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_option( 'slash_test_1', $this->slash_1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( 'slash_test_2', $this->slash_2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( 'slash_test_3', $this->slash_3 );
</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"> * Tests the model function that expects un-slashed 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">- function test_update_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_option( 'slash_test_5', 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'slash_test_5', $this->slash_1 );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionthemeModsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/themeMods.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/themeMods.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/themeMods.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Option_Theme_Mods extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_mod_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_theme_mod( 'non_existent' ) );
</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">- function test_theme_mod_defined_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_defined_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'default', get_theme_mod( 'non_existent', 'default' ) );
</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">- function test_theme_mod_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = 'value';
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'test_name', $expected );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, get_theme_mod( 'test_name' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,13 +22,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51423
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_mod_set_with_invalid_theme_mods_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_set_with_invalid_theme_mods_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_slug = get_option( 'stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'theme_mods_' . $theme_slug, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> self::test_theme_mod_set();
</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">- function test_theme_mod_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'test_update', 'first_value' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'updated_value';
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'test_update', $expected );
</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"> $this->assertSame( $expected, get_theme_mod( 'test_update' ) );
</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">- function test_theme_mod_remove() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_remove() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'test_remove', 'value' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_mod( 'test_remove' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_theme_mod( 'test_remove' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,11 +46,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_theme_mod_default_value_with_percent_symbols
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_mod_default_value_with_percent_symbols( $default, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_mod_default_value_with_percent_symbols( $default, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, get_theme_mod( 'test_name', $default ) );
</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">- function data_theme_mod_default_value_with_percent_symbols() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_theme_mod_default_value_with_percent_symbols() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '100%',
</span></span></pre></div>
<a id="trunktestsphpunittestsoptiontransientphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/transient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/transient.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/transient.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_basics() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_basics() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'key1';
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 'value1';
</span><span class="cx" style="display: block; padding: 0 10px"> $value2 = 'value2';
</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"> $this->assertFalse( delete_transient( $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">- function test_serialized_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_serialized_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => true,
</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"> * @ticket 22807
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_transient_data_with_timeout() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_transient_data_with_timeout() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</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"> * @ticket 22807
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_transient_add_timeout() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_transient_add_timeout() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value2 = rand_str();
</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"> * @ticket 30380
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nonexistent_key_dont_delete_if_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nonexistent_key_dont_delete_if_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a bogus a transient.
</span><span class="cx" style="display: block; padding: 0 10px"> $key = 'test_transient';
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( $key, 'test', 60 * 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30380
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nonexistent_key_old_timeout() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nonexistent_key_old_timeout() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a transient.
</span><span class="cx" style="display: block; padding: 0 10px"> $key = 'test_transient';
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( $key, 'test', 60 * 10 );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionuserSettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/userSettings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/userSettings.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/userSettings.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group 123456
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_Settings extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $user_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->user_id = self::factory()->user->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,13 +17,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['_updated_user_settings'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_set_user_setting() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_user_setting() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $foo = get_user_setting( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $foo );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'bar', get_user_setting( '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">- function test_set_user_setting_dashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_user_setting_dashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $foo = get_user_setting( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $foo );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo-bar-baz', get_user_setting( '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">- function test_set_user_setting_strip_asterisks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_user_setting_strip_asterisks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $foo = get_user_setting( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $foo );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +54,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"> // set_user_setting() bails if `headers_sent()` is true.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_user_setting( $name, $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function set_user_setting( $name, $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $all_user_settings = get_all_user_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> $all_user_settings[ $name ] = $value;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionwpLoadAllOptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/wpLoadAllOptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/wpLoadAllOptions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/option/wpLoadAllOptions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> class Tests_Option_WP_Load_Alloptions extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $alloptions = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->alloptions = null;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_if_alloptions_is_cached() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_if_alloptions_is_cached() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( wp_cache_get( 'alloptions', 'options' ) );
</span><span class="cx" style="display: block; padding: 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,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_if_alloptions_is_cached
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_if_cached_alloptions_is_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_if_cached_alloptions_is_deleted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_cache_delete( 'alloptions', 'options' ) );
</span><span class="cx" style="display: block; padding: 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_if_alloptions_is_cached
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_if_alloptions_are_retrieved_from_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_if_alloptions_are_retrieved_from_cache() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $before = $wpdb->num_queries;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_alloptions();
</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"> * @depends test_if_cached_alloptions_is_deleted
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_if_alloptions_are_retrieved_from_database() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_if_alloptions_are_retrieved_from_database() {
</ins><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"> // Delete the existing cache first.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_if_cached_alloptions_is_deleted
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_pre_cache_alloptions_is_called() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_pre_cache_alloptions_is_called() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $temp = wp_installing();
</span><span class="cx" style="display: block; padding: 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @depends test_if_alloptions_is_cached
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_pre_cache_alloptions_is_not_called() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_pre_cache_alloptions_is_not_called() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $temp = wp_installing();
</span><span class="cx" style="display: block; padding: 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,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $this->alloptions );
</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">- function return_pre_cache_filter( $alloptions ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_pre_cache_filter( $alloptions ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->alloptions = $alloptions;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->alloptions;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspomomophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pomo/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/mo.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/pomo/mo.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_POMO_MO extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_mo_simple() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mo_simple() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO();
</span><span class="cx" style="display: block; padding: 0 10px"> $mo->import_from_file( DIR_TESTDATA . '/pomo/simple.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> $this->assertSame( array( 'yes' ), $mo->entries["kuku\nruku"]->translations );
</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">- function test_mo_plural() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mo_plural() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO();
</span><span class="cx" style="display: block; padding: 0 10px"> $mo->import_from_file( DIR_TESTDATA . '/pomo/plural.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $mo->entries );
</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"> $this->assertSame( 'twoey dragoney', $mo->translate_plural( 'one dragon', '%d dragons', -8 ) );
</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">- function test_mo_context() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mo_context() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO();
</span><span class="cx" style="display: block; padding: 0 10px"> $mo->import_from_file( DIR_TESTDATA . '/pomo/context.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $mo->entries );
</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">- function test_translations_merge() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translations_merge() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $host = new Translations();
</span><span class="cx" style="display: block; padding: 0 10px"> $host->add_entry( new Translation_Entry( array( 'singular' => 'pink' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $host->add_entry( new Translation_Entry( array( 'singular' => 'green' ) ) );
</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"> $this->assertSame( array(), array_diff( array( 'pink', 'green', 'red' ), array_keys( $host->entries ) ) );
</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">- function test_export_mo_file() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_mo_file() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entries = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $entries[] = new Translation_Entry(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> }
</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">- function test_export_should_not_include_empty_translations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_should_not_include_empty_translations() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entries = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO;
</span><span class="cx" style="display: block; padding: 0 10px"> $mo->add_entry(
</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"> $this->assertCount( 0, $again->entries );
</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">- function test_nplurals_with_backslashn() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nplurals_with_backslashn() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO();
</span><span class="cx" style="display: block; padding: 0 10px"> $mo->import_from_file( DIR_TESTDATA . '/pomo/bad_nplurals.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%d foro', $mo->translate_plural( '%d forum', '%d forums', 1 ) );
</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"> $this->assertSame( '%d foros', $mo->translate_plural( '%d forum', '%d forums', -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">- function disabled_test_performance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function disabled_test_performance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $start = microtime( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO();
</span><span class="cx" style="display: block; padding: 0 10px"> $mo->import_from_file( DIR_TESTDATA . '/pomo/de_DE-2.8.mo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // echo "\nPerformance: ".(microtime(true) - $start)."\n";
</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">- function test_overloaded_mb_functions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_overloaded_mb_functions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ( ini_get( 'mbstring.func_overload' ) & 2 ) === 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test requires mbstring.func_overload to be enabled.' );
</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"> $this->assertSame( array( 'Табло' ), $mo->entries['Dashboard']->translations );
</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">- function test_load_pot_file() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_load_pot_file() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mo = new MO();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $mo->import_from_file( DIR_TESTDATA . '/pomo/mo.pot' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspomonoopTranslationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pomo/noopTranslations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/noopTranslations.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/pomo/noopTranslations.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group pomo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_NOOPTranslations extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->noop = new NOOP_Translations;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,31 +17,31 @@
</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">- function test_get_header() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->noop->get_header( 'Content-Type' ) );
</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">- function test_add_entry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_entry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->noop->add_entry( $this->entry );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $this->noop->entries );
</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">- function test_set_header() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_header() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->noop->set_header( 'header', 'value' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $this->noop->headers );
</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">- function test_translate_entry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translate_entry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->noop->add_entry( $this->entry );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->noop->translate_entry( $this->entry ) );
</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">- function test_translate() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translate() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->noop->add_entry( $this->entry );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'baba', $this->noop->translate( 'baba' ) );
</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">- function test_plural() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_plural() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->noop->add_entry( $this->plural_entry );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'dyado', $this->noop->translate_plural( 'dyado', 'dyados', 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'dyados', $this->noop->translate_plural( 'dyado', 'dyados', 11 ) );
</span></span></pre></div>
<a id="trunktestsphpunittestspomopophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/po.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/pomo/po.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> $this->po_a90 = "\"$this->a90\"";
</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">- function test_prepend_each_line() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepend_each_line() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'baba_', $po->prepend_each_line( '', 'baba_' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'baba_dyado', $po->prepend_each_line( 'dyado', 'baba_' ) );
</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"> $this->assertSame( "# baba\n# dyado\n# \n", $po->prepend_each_line( "baba\ndyado\n\n", '# ' ) );
</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">- function test_poify() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_poify() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> // Simple.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '"baba"', $po->poify( 'baba' ) );
</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"> $this->assertSameIgnoreEOL( $this->po_mail, $po->poify( $this->mail ) );
</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">- function test_unpoify() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unpoify() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'baba', $po->unpoify( '"baba"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "baba\ngugu", $po->unpoify( '"baba\n"' . "\t\t\t\n" . '"gugu"' ) );
</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"> $this->assertSameIgnoreEOL( $this->mail, $po->unpoify( $this->po_mail ) );
</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">- function test_export_entry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_entry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "msgid \"baba\"\nmsgstr \"\"", $po->export_entry( $entry ) );
</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"> );
</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">- function test_export_entries() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_entries() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry2 = new Translation_Entry( array( 'singular' => 'dyado' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "msgid \"baba\"\nmsgstr \"\"\n\nmsgid \"dyado\"\nmsgstr \"\"", $po->export_entries() );
</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">- function test_export_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_headers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $po->set_header( 'Project-Id-Version', 'WordPress 2.6-bleeding' );
</span><span class="cx" style="display: block; padding: 0 10px"> $po->set_header( 'POT-Creation-Date', '2008-04-08 18:00+0000' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( "msgid \"\"\nmsgstr \"\"\n\"Project-Id-Version: WordPress 2.6-bleeding\\n\"\n\"POT-Creation-Date: 2008-04-08 18:00+0000\\n\"", $po->export_headers() );
</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">- function test_export() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry2 = new Translation_Entry( array( 'singular' => 'dyado' ) );
</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">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_export_to_file() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_export_to_file() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry2 = new Translation_Entry( array( 'singular' => 'dyado' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $po->export(), file_get_contents( $temp_fn2 ) );
</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">- function test_import_from_file() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_import_from_file() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $res = $po->import_from_file( DIR_TESTDATA . '/pomo/simple.po' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $res );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,12 +316,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $end_quote_entry, $po->entries[ $end_quote_entry->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">- function test_import_from_entry_file_should_give_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_import_from_entry_file_should_give_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $po->import_from_file( DIR_TESTDATA . '/pomo/empty.po' ) );
</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">- function test_import_from_file_with_windows_line_endings_should_work_as_with_unix_line_endings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_import_from_file_with_windows_line_endings_should_work_as_with_unix_line_endings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = new PO();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $po->import_from_file( DIR_TESTDATA . '/pomo/windows-line-endings.po' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $po->entries );
</span></span></pre></div>
<a id="trunktestsphpunittestspomotranslationEntryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pomo/translationEntry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/translationEntry.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/pomo/translationEntry.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_POMO_TranslationEntry extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_create_entry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_entry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No singular => empty object.
</span><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $entry->singular );
</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"> $this->assertSame( array(), $entry->flags );
</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">- function test_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_key() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry_baba = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry_dyado = new Translation_Entry( array( 'singular' => 'dyado' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry_baba_ctxt = new Translation_Entry(
</span></span></pre></div>
<a id="trunktestsphpunittestspomotranslationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pomo/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/translations.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/pomo/translations.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_POMO_Translations extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_entry() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_entry() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry2 = new Translation_Entry( array( 'singular' => 'dyado' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $empty = new Translation_Entry();
</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"> $this->assertSame( $entry->key(), $entries[0]->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">- function test_translate() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translate() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry1 = new Translation_Entry(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => 'baba',
</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"> $this->assertSame( 'babaz', $domain->translate( 'babaz' ) );
</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">- function test_translate_plural() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translate_plural() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry_incomplete = new Translation_Entry(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => 'baba',
</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"> $this->assertSame( 'dyadoy', $domain->translate_plural( 'dyado', 'dyados', -18881 ) );
</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">- function test_digit_and_merge() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_digit_and_merge() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry_digit_1 = new Translation_Entry(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => 1,
</span></span></pre></div>
<a id="trunktestsphpunittestspostattachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/attachments.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/attachments.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,13 +7,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Attachments extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove all uploads.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->remove_added_uploads();
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_insert_bogus_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_bogus_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = rand_str() . '.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $upload['error'] );
</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">- function test_insert_image_no_thumb() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_image_no_thumb() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This image is smaller than the thumbnail size so it won't have one.
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );
</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"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_image_thumb_only() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_image_thumb_only() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_w', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_h', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_image_medium_sizes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_image_medium_sizes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_w', 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_h', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_image_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_image_delete() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_w', 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_h', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18310
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21963
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_image_without_guid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_image_without_guid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This image is smaller than the thumbnail size so it won't have one.
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = file_get_contents( $filename );
</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"> * @ticket 21963
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_attachment_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_attachment_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = file_get_contents( $filename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29646
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_orphan_attachment_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_orphan_attachment_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = file_get_contents( $filename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostfilteringphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/filtering.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/filtering.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/filtering.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group formatting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Filtering extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_balanceTags', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> kses_init_filters();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,13 +17,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> kses_remove_filters();
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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"> // A simple test to make sure unclosed tags are fixed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_content_unknown_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_content_unknown_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <foobar>no such tag</foobar>
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // A simple test to make sure unbalanced tags are fixed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_content_unbalanced_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_content_unbalanced_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <i>italics
</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><span class="cx" style="display: block; padding: 0 10px"> // Test KSES filtering of disallowed attribute.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_content_disallowed_attr() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_content_disallowed_attr() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <img src='foo' width='500' href='shlorp' />
</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"> * @ticket 12394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_content_xhtml_empty_elem() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_content_xhtml_empty_elem() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <img src='foo' width='500' height='300'/>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure unbalanced tags are untouched when the balance option is off.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_content_nobalance_nextpage_more() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_content_nobalance_nextpage_more() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_balanceTags', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostformatsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/formats.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/formats.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group post
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Formats extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_get_post_format_for_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_get_post_format_for_post() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22473
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_get_post_format_for_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_get_post_format_for_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_post_type_support( 'page', 'post-formats' );
</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">- function test_has_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_format() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_format( 'standard', $post_id ) );
</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"> * @ticket 23570
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_url_in_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_url_in_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = 'http://nytimes.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $commentary = 'This is my favorite link';
</span><span class="cx" style="display: block; padding: 0 10px"> $link_with_commentary = <<<DATA
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPageUriphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/getPageUri.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPageUri.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/getPageUri.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_page_uri_with_stdclass_post_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_page_uri_with_stdclass_post_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Mimick an old stdClass post object, missing the ancestors field.
</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"> * @ticket 24491
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_page_uri_with_nonexistent_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_page_uri_with_nonexistent_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $wpdb->get_var( "SELECT MAX(ID) FROM $wpdb->posts" ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_page_uri( $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15963
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_uri_check_orphan() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_uri_check_orphan() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::factory()->post->create( array( 'post_name' => 'parent' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $child_id = self::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">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36174
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_page_uri_with_a_draft_parent_with_empty_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_page_uri_with_a_draft_parent_with_empty_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::factory()->post->create( array( 'post_name' => 'parent' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $child_id = self::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">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26284
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_page_uri_without_argument() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_page_uri_without_argument() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Blood Orange announces summer tour dates',
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/getPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPages.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/getPages.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23167
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pages_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pages_cache() {
</ins><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"> self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20376
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pages_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pages_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'some-meta-key', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'some-meta-key', '' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22074
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pages_include_exclude() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pages_include_exclude() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 20 ) as $i ) {
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9470
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pages_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pages_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id2 = self::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">@@ -367,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_dropdown_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '#<option#', wp_dropdown_pages( 'echo=0' ), $matches );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22208
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_chidren_fields_ids() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_chidren_fields_ids() {
</ins><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"> $child_ids = self::factory()->post->create_many( 5, array( 'post_parent' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25750
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pages_hierarchical_and_no_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pages_hierarchical_and_no_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $page_1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $page_2 = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +618,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">- function test_wp_list_pages_classes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_classes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'taco';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> $type,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( $type );
</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">- function test_exclude_tree() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exclude_tree() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
</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"> array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43514
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_pages_cache_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_pages_cache_empty() {
</ins><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"> wp_cache_delete( 'last_changed', 'posts' );
</span></span></pre></div>
<a id="trunktestsphpunittestspostisPostStatusViewablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/isPostStatusViewable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/isPostStatusViewable.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/isPostStatusViewable.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global $wp_post_statuses
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static function wpTearDownAfterClass() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpTearDownAfterClass() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_post_statuses;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $wp_post_statuses['wp_tests_ps'] );
</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"> * @param mixed $status Post status to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected viewable status.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_built_unregistered_in_status_types( $status, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_built_unregistered_in_status_types( $status, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test status passed as string.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, is_post_status_viewable( $status ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Test status passed as object.
</span></span></pre></div>
<a id="trunktestsphpunittestspostmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/meta.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/meta.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::delete_user( self::$author );
</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">- function test_unique_postmeta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unique_postmeta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add a unique post meta item.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id, 'unique', 'value', true ) );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nonunique_postmeta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nonunique_postmeta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add two non-unique post meta items.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'value' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'another value' ) );
</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"> $this->assertTrue( delete_post_meta_by_key( 'nonunique' ) );
</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">- function test_update_post_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_post_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add a unique post meta item.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
</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">
</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">- function test_delete_post_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_post_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add two unique post meta items.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id, 'unique_delete', 'value', true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id_2, 'unique_delete', 'value', true ) );
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_delete_post_meta_by_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_post_meta_by_key() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add two unique post meta items.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id, 'unique_delete_by_key', 'value', true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( add_post_meta( self::$post_id_2, 'unique_delete_by_key', 'value', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_post_meta( self::$post_id_2, 'unique_delete_by_key', 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">- function test_get_post_meta_by_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_meta_by_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mid = add_post_meta( self::$post_id, 'get_post_meta_by_key', 'get_post_meta_by_key_value', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( $mid );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> delete_metadata_by_mid( 'post', $mid );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_delete_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mid = add_post_meta( self::$post_id, 'delete_meta', 'delete_meta_value', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( $mid );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertFalse( delete_meta( 123456789 ) );
</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">- function test_update_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add a unique post meta item.
</span><span class="cx" style="display: block; padding: 0 10px"> $mid1 = add_post_meta( self::$post_id, 'unique_update', 'value', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsInt( $mid1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12860
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_funky_post_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_funky_post_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classy = new StdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $classy->ID = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $classy->stringy = 'I love slashes\\\\';
</span></span></pre></div>
<a id="trunktestsphpunittestspostnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $menu_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->menu_id = wp_create_nav_menu( rand_str() );
</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"> $this->assertStringStartsWith( '<ul', $menu );
</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">- function test_wp_get_associated_nav_menu_items() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_associated_nav_menu_items() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id = self::factory()->category->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27113
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_orphan_nav_menu_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_orphan_nav_menu_item() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create an orphan nav menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_item_id = wp_update_nav_menu_item(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13910
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_nav_menu_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_nav_menu_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Register a nav menu location.
</span><span class="cx" style="display: block; padding: 0 10px"> register_nav_menu( 'primary', 'Primary Navigation' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29460
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_orderby_name_by_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_orderby_name_by_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // We are going to create a random number of menus (min 2, max 10).
</span><span class="cx" style="display: block; padding: 0 10px"> $menus_no = rand( 2, 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35324
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_setup_nav_menu_item_for_post_type_archive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_setup_nav_menu_item_for_post_type_archive() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = rand_str();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35324
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_setup_nav_menu_item_for_post_type_archive_no_description() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_setup_nav_menu_item_for_post_type_archive_no_description() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = '';
</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"> * @ticket 35324
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_setup_nav_menu_item_for_post_type_archive_custom_description() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_setup_nav_menu_item_for_post_type_archive_custom_description() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = rand_str();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35324
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_setup_nav_menu_item_for_unknown_post_type_archive_no_description() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_setup_nav_menu_item_for_unknown_post_type_archive_no_description() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19038
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_setup_nav_menu_item_for_trashed_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_setup_nav_menu_item_for_trashed_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'trash',
</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"> * @ticket 35206
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_nav_menu_whitespace_options() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_nav_menu_whitespace_options() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id1 = self::factory()->post->create();
</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"> $post_id3 = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24587
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_nav_menu_filters_are_passed_args_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_nav_menu_filters_are_passed_args_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_insert = wp_update_nav_menu_item(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,19 +505,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * arguments are an object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> // In function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_wp_nav_menu', array( $this, '_confirm_second_param_args_object' ), 10, 2 );
- add_filter( 'wp_nav_menu_objects', array( $this, '_confirm_second_param_args_object' ), 10, 2 );
- add_filter( 'wp_nav_menu_items', array( $this, '_confirm_second_param_args_object' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_wp_nav_menu', array( $this, 'confirm_second_param_args_object' ), 10, 2 );
+ add_filter( 'wp_nav_menu_objects', array( $this, 'confirm_second_param_args_object' ), 10, 2 );
+ add_filter( 'wp_nav_menu_items', array( $this, 'confirm_second_param_args_object' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // In walker.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'nav_menu_item_args', array( $this, '_confirm_nav_menu_item_args_object' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'nav_menu_item_args', array( $this, 'confirm_nav_menu_item_args_object' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'nav_menu_css_class', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
- add_filter( 'nav_menu_item_id', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
- add_filter( 'nav_menu_link_attributes', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
- add_filter( 'nav_menu_item_title', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'nav_menu_css_class', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
+ add_filter( 'nav_menu_item_id', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
+ add_filter( 'nav_menu_link_attributes', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
+ add_filter( 'nav_menu_item_title', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'walker_nav_menu_start_el', array( $this, '_confirm_forth_param_args_object' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'walker_nav_menu_start_el', array( $this, 'confirm_forth_param_args_object' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,19 +531,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove test filters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> // In function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_wp_nav_menu', array( $this, '_confirm_second_param_args_object' ), 10, 2 );
- remove_filter( 'wp_nav_menu_objects', array( $this, '_confirm_second_param_args_object' ), 10, 2 );
- remove_filter( 'wp_nav_menu_items', array( $this, '_confirm_second_param_args_object' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_wp_nav_menu', array( $this, 'confirm_second_param_args_object' ), 10, 2 );
+ remove_filter( 'wp_nav_menu_objects', array( $this, 'confirm_second_param_args_object' ), 10, 2 );
+ remove_filter( 'wp_nav_menu_items', array( $this, 'confirm_second_param_args_object' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // In walker.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'nav_menu_item_args', array( $this, '_confirm_nav_menu_item_args_object' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'nav_menu_item_args', array( $this, 'confirm_nav_menu_item_args_object' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'nav_menu_css_class', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
- remove_filter( 'nav_menu_item_id', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
- remove_filter( 'nav_menu_link_attributes', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
- remove_filter( 'nav_menu_item_title', array( $this, '_confirm_third_param_args_object' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'nav_menu_css_class', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
+ remove_filter( 'nav_menu_item_id', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
+ remove_filter( 'nav_menu_link_attributes', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
+ remove_filter( 'nav_menu_item_title', array( $this, 'confirm_third_param_args_object' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'walker_nav_menu_start_el', array( $this, '_confirm_forth_param_args_object' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'walker_nav_menu_start_el', array( $this, 'confirm_forth_param_args_object' ), 10, 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,22 +550,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Run tests required to confrim Walker_Nav_Menu receives an $args object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _confirm_nav_menu_item_args_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function confirm_nav_menu_item_args_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsObject( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</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">- function _confirm_second_param_args_object( $ignored_1, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function confirm_second_param_args_object( $ignored_1, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsObject( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> return $ignored_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">- function _confirm_third_param_args_object( $ignored_1, $ignored_2, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function confirm_third_param_args_object( $ignored_1, $ignored_2, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsObject( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> return $ignored_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">- function _confirm_forth_param_args_object( $ignored_1, $ignored_2, $ignored_3, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function confirm_forth_param_args_object( $ignored_1, $ignored_2, $ignored_3, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsObject( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> return $ignored_1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35272
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_front_page_class_applied() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_front_page_class_applied() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35272
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_class_applied_to_front_page_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_class_applied_to_front_page_item() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +638,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35272
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_class_not_applied_to_taxonomies_with_same_id_as_front_page_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_class_not_applied_to_taxonomies_with_same_id_as_front_page_item() {
</ins><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"> $new_id = 35272;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -681,7 +681,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_wp_delete_customize_changeset_dependent_auto_drafts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_delete_customize_changeset_dependent_auto_drafts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_delete_customize_changeset_dependent_auto_drafts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $auto_draft_post_id = $this->factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'auto-draft',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39800
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parent_ancestor_for_post_archive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_ancestor_for_post_archive() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'books',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +821,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Provides IRI matching data for _wp_menu_item_classes_by_context() 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">- function get_iri_current_menu_items() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_iri_current_menu_items() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -836,7 +836,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43401
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider get_iri_current_menu_items
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_iri_current_menu_item( $custom_link, $current = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_iri_current_menu_item( $custom_link, $current = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->menu_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</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"> * @ticket 44005
</span><span class="cx" style="display: block; padding: 0 10px"> * @group privacy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_privacy_policy_class_applied() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_privacy_policy_class_applied() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,7 +896,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44005
</span><span class="cx" style="display: block; padding: 0 10px"> * @group privacy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_class_applied_to_privacy_policy_page_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_class_applied_to_privacy_policy_page_item() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,7 +930,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47723
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_trim_url_for_custom_item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trim_url_for_custom_item( $custom_url, $correct_url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trim_url_for_custom_item( $custom_url, $correct_url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $custom_item_id = wp_update_nav_menu_item(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->menu_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -949,7 +949,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Provides data for test_trim_url_for_custom_item().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_trim_url_for_custom_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_trim_url_for_custom_item() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'https://wordpress.org ', 'https://wordpress.org' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( ' https://wordpress.org', 'https://wordpress.org' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,7 +964,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48011
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_nav_menu_item_with_special_characters_in_category_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_nav_menu_item_with_special_characters_in_category_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $category_name = 'Test Cat - \"Pre-Slashed\" Cat Name & >';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $category = self::factory()->category->create_and_get(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1001,7 +1001,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_nav_menu_item_with_post_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_nav_menu_item_with_post_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_date = '2020-12-28 11:26:35';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = '2020-12-29 10:11:45';
</span><span class="cx" style="display: block; padding: 0 10px"> $invalid_date = '2020-12-41 14:15:27';
</span></span></pre></div>
<a id="trunktestsphpunittestspostobjectsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/objects.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/objects.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/objects.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Post_Objects extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->post->create();
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( get_post( false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_ancestors() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_ancestors() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $child_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $grandchild_id = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22882
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_ancestors_with_falsey_values() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_ancestors_with_falsey_values() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( null, 0, false, '0', '' ) as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( get_post_ancestors( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_post_ancestors( $post_id ) );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_category_property() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_category_property() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $term2['term_id'], $term3['term_id'], $term1['term_id'] ), $post['post_category'] );
</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">- function test_get_tags_input_property() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_tags_input_property() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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"> $this->assertSame( array( 'Bar', 'Baz', 'Foo' ), $post['tags_input'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_page_template_property() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_page_template_property() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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"> $this->assertSame( $template, $post->page_template );
</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">- function test_get_post_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post(
</span><span class="cx" style="display: block; padding: 0 10px"> self::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">@@ -200,7 +200,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">- function test_get_post_identity() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_identity() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( self::factory()->post->create() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post->foo = 'bar';
</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"> $this->assertSame( 'bar', get_post( $post, OBJECT, 'display' )->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">- function test_get_post_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id, ARRAY_A );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22223
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_cache() {
</ins><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"> $id = self::factory()->post->create();
</span></span></pre></div>
<a id="trunktestsphpunittestspostoutputphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/output.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/output.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/output.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,19 +8,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Output extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_shortcode( 'dumptag', array( $this, '_shortcode_dumptag' ) );
- add_shortcode( 'paragraph', array( $this, '_shortcode_paragraph' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_shortcode( 'dumptag', array( $this, 'shortcode_dumptag' ) );
+ add_shortcode( 'paragraph', array( $this, 'shortcode_paragraph' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $shortcode_tags['dumptag'], $shortcode_tags['paragraph'] );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function _shortcode_dumptag( $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_dumptag( $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= "$k = $v\n";
</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"> return $out;
</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">- function _shortcode_paragraph( $atts, $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_paragraph( $atts, $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $processed_atts = shortcode_atts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'graf',
</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"> return "<p class='{$processed_atts['class']}'>$content</p>\n";
</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">- function test_the_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <i>This is the excerpt.</i>
</span><span class="cx" style="display: block; padding: 0 10px"> <!--more-->
</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"> $this->assertSame( strip_ws( $expected ), strip_ws( get_echo( 'the_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">- function test_the_content_shortcode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_content_shortcode() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> [dumptag foo="bar" baz="123"]
</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"> $this->assertSame( strip_ws( $expected ), strip_ws( get_echo( 'the_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">- function test_the_content_shortcode_paragraph() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_content_shortcode_paragraph() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_content = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> Graf by itself:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( strip_ws( $expected ), strip_ws( get_echo( 'the_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">- function test_the_content_attribute_filtering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_content_attribute_filtering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> kses_init_filters();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // http://bpr3.org/?p=87
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> kses_remove_filters();
</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">- function test_the_content_attribute_value_with_colon() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_content_attribute_value_with_colon() {
</ins><span class="cx" style="display: block; padding: 0 10px"> kses_init_filters();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // http://bpr3.org/?p=87
</span></span></pre></div>
<a id="trunktestsphpunittestspostqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/query.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_category__and_var() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category__and_var() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->category->create(
</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"> * @ticket 28099
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_category__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_category__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_id = self::factory()->category->create();
</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"> wp_set_post_categories( $post_id, $cat_id );
</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"> * @ticket 22448
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_posts_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_posts_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create posts and clear their caches.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = self::factory()->post->create_many( 4 );
</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">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Use with the_posts filter, appends a post and adds some custom 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">- function the_posts_filter( $posts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function the_posts_filter( $posts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts[] = clone $posts[0];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add some custom data to each post.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $posts;
</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">- function test_post__in_ordering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post__in_ordering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id1 = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ordered, wp_list_pluck( $q->posts, '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">- function test_post__in_attachment_ordering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post__in_attachment_ordering() {
</ins><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"> $att_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ordered, wp_list_pluck( $q->posts, 'post_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $statuses1 = get_post_stati();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'auto-draft', $statuses1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17065
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_orderby_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_orderby_array() {
</ins><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"> $q1 = new WP_Query(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17065
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_order() {
</ins><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"> $q1 = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,7 +407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29629
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_orderby() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_orderby() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 'rand' is a valid value.
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array( 'orderby' => 'rand' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'ORDER BY RAND()', $q->request );
</span></span></pre></div>
<a id="trunktestsphpunittestspostrevisionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/revisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/revisions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/revisions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$author_user_id = $factory->user->create( array( 'role' => 'author' ) );
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type = rand_str( 20 );
</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"> * @ticket 20982
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16215
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_restore_updates_edit_last_post_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_restore_updates_edit_last_post_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a post as Author.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_default_post_to_edit( 'post', true );
</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"> * @ticket 7392
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9843
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_dont_save_revision_if_unchanged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_dont_save_revision_if_unchanged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_default_post_to_edit( 'post', true );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 7392
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9843
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_force_save_revision_even_if_unchanged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_force_save_revision_even_if_unchanged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_save_post_revision_check_for_changes', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_default_post_to_edit( 'post', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_view_caps_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_view_caps_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_restore_caps_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_restore_caps_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_diff_caps_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_diff_caps_post() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_view_caps_cpt() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_view_caps_cpt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_restore_caps_cpt() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_restore_caps_cpt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type,
</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"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_restore_caps_before_publish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_restore_caps_before_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_diff_caps_cpt() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_diff_caps_cpt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26042
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_post_revisions_should_order_by_post_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_post_revisions_should_order_by_post_date() {
</ins><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"> $post = self::factory()->post->create_and_get(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26042
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_post_revisions_should_order_by_ID_when_post_date_matches() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_post_revisions_should_order_by_ID_when_post_date_matches() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'some-post',
</span></span></pre></div>
<a id="trunktestsphpunittestspostslashesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/slashes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$post_id = $factory->post->create();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the controller function that expects slashed data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_edit_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> $_POST = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_insert_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_update_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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"> wp_update_post(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27550
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_trash_untrash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_trash_untrash() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $this->slash_1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $this->slash_3,
</span></span></pre></div>
<a id="trunktestsphpunittestsposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/template.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/template.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Post_Template extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_link_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_link_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contents = array( 'One', 'Two', 'Three' );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = implode( '<!--nextpage-->', $contents );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => $content ) );
</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"> $this->assertSame( $pagelink, $output );
</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">- function test_wp_dropdown_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_dropdown_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $none = wp_dropdown_pages( array( 'echo' => 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $none );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostthumbnailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/thumbnails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/thumbnails.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/thumbnails.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> parent::tear_down_after_class();
</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">- function test_has_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_thumbnail( self::$post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_thumbnail( self::$post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_thumbnail() );
</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"> $this->assertTrue( has_post_thumbnail() );
</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">- function test_get_post_thumbnail_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_thumbnail_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, get_post_thumbnail_id( self::$post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, get_post_thumbnail_id( self::$post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_post_thumbnail_id() );
</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"> $this->assertSame( self::$attachment_id, get_post_thumbnail_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">- function test_update_post_thumbnail_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_post_thumbnail_cache() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( self::$post, self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12235
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_post_thumbnail_caption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_post_thumbnail_caption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_the_post_thumbnail_caption() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $caption = 'This is a caption.';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12235
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_post_thumbnail_caption_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_post_thumbnail_caption_empty() {
</ins><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"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> 'image.jpg',
</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"> * @ticket 12235
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_post_thumbnail_caption() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_post_thumbnail_caption() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caption = 'This is a caption.';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail_caption( $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">- function test_get_the_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_the_post_thumbnail() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_the_post_thumbnail( self::$post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( self::$post, self::$attachment_id );
</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"> $this->assertSame( $expected, get_the_post_thumbnail() );
</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">- function test_the_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</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"> * @ticket 33070
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_post_thumbnail_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_post_thumbnail_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_thumbnail( self::$post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_the_post_thumbnail_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_the_post_thumbnail_url( self::$post ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33070
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_post_thumbnail_url_with_invalid_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_post_thumbnail_url_with_invalid_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( self::$post, self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( get_the_post_thumbnail_url( self::$post->ID ) );
</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"> * @ticket 33070
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_post_thumbnail_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_post_thumbnail_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = self::$post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12922
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test__wp_preview_post_thumbnail_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__wp_preview_post_thumbnail_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = self::$post;
</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"> * @ticket 37697
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test__wp_preview_post_thumbnail_filter_secondary_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__wp_preview_post_thumbnail_filter_secondary_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $secondary_post = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12922
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_post_with_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_post_with_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => self::$post->ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37658
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_attachment_with_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_attachment_with_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Audio files support featured images.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39030
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail_size_filter_simple() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail_size_filter_simple() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->current_size_filter_data = 'medium';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_thumbnail_size', array( $this, 'filter_post_thumbnail_size' ), 10, 2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39030
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_post_thumbnail_size_filter_complex
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail_size_filter_complex( $which_post, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail_size_filter_complex( $which_post, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->current_size_filter_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post->ID => 'medium',
</span><span class="cx" style="display: block; padding: 0 10px"> self::$different_post->ID => 'thumbnail',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $result );
</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">- function data_post_thumbnail_size_filter_complex() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_post_thumbnail_size_filter_complex() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 0, 'medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, 'thumbnail' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +415,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">- function filter_post_thumbnail_size( $size, $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_post_thumbnail_size( $size, $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->current_size_filter_data ) && isset( $this->current_size_filter_data[ $post_id ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->current_size_filter_data[ $post_id ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $size;
</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">- function filter_set_post_thumbnail_size_result( $html, $post_id, $post_thumbnail_id, $size ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_post_thumbnail_size_result( $html, $post_id, $post_thumbnail_id, $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->current_size_filter_result = $size;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $html;
</span></span></pre></div>
<a id="trunktestsphpunittestsposttypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/types.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/types.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,13 +18,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type = rand_str( 20 );
</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">- function test_register_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( get_post_type_object( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48558
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_return_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_return_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Post_Type', register_post_type( '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">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_with_too_long_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_with_too_long_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Post type too long.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', register_post_type( 'abcdefghijklmnopqrstuvwxyz0123456789' ) );
</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"> * @expectedIncorrectUsage register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_with_empty_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_with_empty_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Post type too short.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', register_post_type( '' ) );
</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"> * @ticket 35985
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_exclude_from_search_should_default_to_opposite_value_of_public() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_exclude_from_search_should_default_to_opposite_value_of_public() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 'public' Default is false
</span><span class="cx" style="display: block; padding: 0 10px"> * 'exclude_from_search' Default is null (opposite 'public')
</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"> * @ticket 35985
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_publicly_queryable_should_default_to_value_of_public() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_publicly_queryable_should_default_to_value_of_public() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 'public' Default is false
</span><span class="cx" style="display: block; padding: 0 10px"> * 'publicly_queryable' Default is null ('public')
</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"> * @ticket 35985
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_show_ui_should_default_to_value_of_public() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_show_ui_should_default_to_value_of_public() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 'public' Default is false
</span><span class="cx" style="display: block; padding: 0 10px"> * 'show_ui' Default is null ('public')
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35985
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_show_in_menu_should_default_to_value_of_show_ui() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_show_in_menu_should_default_to_value_of_show_ui() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 'public' Default is false
</span><span class="cx" style="display: block; padding: 0 10px"> * 'show_ui' Default is null ('public')
</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"> * @ticket 35985
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_show_in_nav_menus_should_default_to_value_of_public() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_show_in_nav_menus_should_default_to_value_of_public() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 'public' Default is false
</span><span class="cx" style="display: block; padding: 0 10px"> * 'show_in_nav_menus' Default is null ('public')
</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"> * @ticket 35985
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_post_type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_post_type_show_in_admin_bar_should_default_to_value_of_show_in_menu() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_post_type_show_in_admin_bar_should_default_to_value_of_show_in_menu() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 'public' Default is false
</span><span class="cx" style="display: block; padding: 0 10px"> * 'show_in_menu' Default is null ('show_ui' > 'public')
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $public, $args->show_in_admin_bar );
</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">- function test_register_taxonomy_for_object_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_taxonomy_for_object_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,12 +185,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( 'bar' );
</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">- function test_post_type_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( post_type_exists( 'notaposttype' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( post_type_exists( 'post' ) );
</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">- function test_post_type_supports() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_supports() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( post_type_supports( 'post', 'post-formats' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( post_type_supports( 'page', 'post-formats' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( post_type_supports( 'notaposttype', 'post-formats' ) );
</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"> * @ticket 21586
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_type_with_no_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_with_no_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo', array( 'supports' => array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( post_type_supports( 'foo', 'editor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( post_type_supports( 'foo', 'title' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23302
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_type_with_no_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_with_no_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permastruct = get_option( 'permalink_structure' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'permalink_structure', '%postname%' );
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpAfterInsertPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpAfterInsertPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpAfterInsertPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/wpAfterInsertPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param null|WP_Post $post_before Null for new posts, the WP_Post object prior
</span><span class="cx" style="display: block; padding: 0 10px"> * to the update for updated posts.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function action_wp_after_insert_post( $post_id, $post, $update, $post_before ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_wp_after_insert_post( $post_id, $post, $update, $post_before ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$passed_post_title = $post->post_title;
</span><span class="cx" style="display: block; padding: 0 10px"> self::$passed_post_status = $post->post_status;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpInsertPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpInsertPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpInsertPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/wpInsertPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> $role->add_cap( 'publish_unmapped_meta_caps' );
</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">- static function tear_down_after_class() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function tear_down_after_class() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $role = get_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> $role->remove_cap( 'publish_mapped_meta_caps' );
</span><span class="cx" style="display: block; padding: 0 10px"> $role->remove_cap( 'publish_unmapped_meta_caps' );
</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"> parent::tear_down_after_class();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</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"> * @ticket 11863
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trashing_a_post_should_add_trashed_suffix_to_post_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trashing_a_post_should_add_trashed_suffix_to_post_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $trashed_about_page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="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"> * @ticket 11863
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_trashed_posts_original_post_name_should_be_reassigned_after_untrashing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trashed_posts_original_post_name_should_be_reassigned_after_untrashing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $about_page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11863
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_creating_a_new_post_should_add_trashed_suffix_to_post_name_of_trashed_posts_with_the_desired_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_creating_a_new_post_should_add_trashed_suffix_to_post_name_of_trashed_posts_with_the_desired_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $trashed_about_page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11863
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_untrashing_a_post_with_a_stored_desired_post_name_should_get_its_post_name_suffixed_if_another_post_has_taken_the_desired_post_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_untrashing_a_post_with_a_stored_desired_post_name_should_get_its_post_name_suffixed_if_another_post_has_taken_the_desired_post_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $about_page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23022
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_various_post_statuses
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_untrashing_a_post_should_always_restore_it_to_draft_status( $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_untrashing_a_post_should_always_restore_it_to_draft_status( $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23022
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_various_post_statuses
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_untrash_post_status_filter_restores_post_to_correct_status( $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_untrash_post_status_filter_restores_post_to_correct_status( $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_untrash_post_status', 'wp_untrash_post_set_previous_status', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of test arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_various_post_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_various_post_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'mapped_meta_caps',
</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"> * @return array Array of test arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_various_post_statuses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_various_post_statuses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'draft',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42464
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_various_post_types
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_contributor_cannot_set_post_slug( $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_contributor_cannot_set_post_slug( $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user_ids['contributor'] );
</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(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42464
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_various_post_types
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_administrator_can_set_post_slug( $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_administrator_can_set_post_slug( $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user_ids['administrator'] );
</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(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42464
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_administrator_cannot_set_post_slug_on_post_type_they_cannot_publish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_administrator_cannot_set_post_slug_on_post_type_they_cannot_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user_ids['administrator'] );
</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(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25347
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_scheduled_post_with_a_past_date_should_be_published() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_scheduled_post_with_a_past_date_should_be_published() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = new DateTimeImmutable( 'now', new DateTimeZone( 'UTC' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpListPagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpListPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpListPages.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/wpListPages.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_pages_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_depth() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_depth() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => 1,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_show_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_show_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => 1,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_date_format() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_date_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_date' => true,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_child_of() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_child_of() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => self::$parent_2,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_exclude() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_exclude() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => self::$parent_2,
</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->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_title_li() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_title_li() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,7 +267,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_echo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_echo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_list_pages( $args );
</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">- function test_wp_list_pages_authors() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_authors() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'authors' => self::$author,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_number() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_number() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_sort_column() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_sort_column() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => 1,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_link_before() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_link_before() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => 'BEFORE',
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_link_after() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_link_after() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => 'AFTER',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,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">- function test_wp_list_pages_include() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_include() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => self::$parent_1 . ',' . self::$parent_3,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_exclude_tree() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_exclude_tree() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude_tree' => self::$parent_2 . ',' . self::$parent_3,
</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"> $this->assertSameIgnoreEOL( $expected, wp_list_pages( $args ) );
</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">- function test_wp_list_pages_discarded_whitespace() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_pages_discarded_whitespace() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'item_spacing' => 'discard',
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpPublishPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpPublishPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpPublishPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/wpPublishPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51292
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_publish_post_respects_current_categories() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post_respects_current_categories() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$auto_draft_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $category_id = $this->factory->term->create( array( 'taxonomy' => 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, $category_id );
</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"> * @covers ::wp_publish_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51292
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_publish_post_adds_default_category() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post_adds_default_category() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$auto_draft_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_publish_post( $post_id );
</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"> * @covers ::wp_publish_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51292
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_publish_post_adds_default_category_when_tagged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post_adds_default_category_when_tagged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$auto_draft_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_id = $this->factory->term->create( array( 'taxonomy' => 'post_tag' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_tags( $post_id, array( $tag_id ) );
</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"> * @covers ::wp_publish_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51292
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_publish_post_respects_current_terms() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post_respects_current_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create custom taxonomy to test with.
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_51292',
</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"> * @covers ::wp_publish_post
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51292
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_publish_post_adds_default_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post_adds_default_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create custom taxonomy to test with.
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_51292',
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpUniquePostSlugphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 18962
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_unique_post_slug_with_hierarchy_and_attachments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_unique_post_slug_with_hierarchy_and_attachments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-1', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/post.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> remove_role( 'grammarian' );
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</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"> * Helper function: return the timestamp(s) of cron jobs for the specified hook and 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">- function _next_schedule_for_post( $hook, $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function next_schedule_for_post( $hook, $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_next_scheduled( 'publish_future_post', array( 0 => (int) $id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Helper function, unsets current user globally.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _unset_current_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function unset_current_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_user, $user_ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = null;
</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"> * Test simple valid behavior: insert and get a 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">- function test_vb_insert_get_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_get_delete() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'cpt', array( 'taxonomies' => array( 'post_tag', 'ctax' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'ctax', 'cpt' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_types = array( 'post', 'cpt' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Insert a post with a future date, and make sure the status and cron schedule are correct.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,13 +148,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There should be a publish_future_post hook scheduled on the future date.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date, $this->next_schedule_for_post( 'publish_future_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="cx" style="display: block; padding: 0 10px"> * Insert a post with a future date, and make sure the status and cron schedule are correct.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_over_dst() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_over_dst() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Some magic days - one DST one not.
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date_1 = strtotime( 'June 21st +1 year' );
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date_2 = strtotime( 'Jan 11th +1 year' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that there's a publish_future_post job scheduled at the right time.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_1, $this->next_schedule_for_post( 'publish_future_post', $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now save it again with a date further in the future.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And the correct date on the cron job.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_2, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_2, $this->next_schedule_for_post( 'publish_future_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">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 4710
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_edit_bug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_edit_bug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date_1 = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date_2 = strtotime( '+2 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that there's a publish_future_post job scheduled at the right time.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_1, $this->next_schedule_for_post( 'publish_future_post', $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now save it again with a date further in the future.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,13 +237,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And the correct date on the cron job.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_2, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_2, $this->next_schedule_for_post( 'publish_future_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="cx" style="display: block; padding: 0 10px"> * Insert a draft post with a future date, and make sure no cron schedule is set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_draft() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_draft() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</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->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There should be a publish_future_post hook scheduled on the future date.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->next_schedule_for_post( 'publish_future_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">@@ -278,7 +278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Insert a future post, then edit and change it to draft, and make sure cron gets it right.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_change_to_draft() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_change_to_draft() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date_1 = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that there's a publish_future_post job scheduled at the right time.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_1, $this->next_schedule_for_post( 'publish_future_post', $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now save it again with status set to draft.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,13 +313,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And the correct date on the cron job.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->next_schedule_for_post( 'publish_future_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="cx" style="display: block; padding: 0 10px"> * Insert a future post, then edit and change the status, and make sure cron gets it right.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_change_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_change_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date_1 = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $statuses = array( 'draft', 'static', 'object', 'attachment', 'inherit', 'pending' );
</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"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that there's a publish_future_post job scheduled at the right time.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_1, $this->next_schedule_for_post( 'publish_future_post', $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now save it again with status changed.
</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"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And the correct date on the cron job.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->next_schedule_for_post( 'publish_future_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">@@ -364,7 +364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Insert a draft post with a future date, and make sure no cron schedule is set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_private() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_private() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,7 +392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There should be a publish_future_post hook scheduled on the future date.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->next_schedule_for_post( 'publish_future_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">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17180
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_invalid_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_invalid_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Insert a future post, then edit and change it to private, and make sure cron gets it right.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_vb_insert_future_change_to_private() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_vb_insert_future_change_to_private() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date_1 = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that there's a publish_future_post job scheduled at the right time.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date_1, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date_1, $this->next_schedule_for_post( 'publish_future_post', $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now save it again with status set to draft.
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $this->assertSame( $post['post_date'], $out->post_date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And the correct date on the cron job.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->next_schedule_for_post( 'publish_future_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">@@ -527,7 +527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5364
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_delete_future_post_cron() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_future_post_cron() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date = strtotime( '+1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,12 +543,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_ids[] = $id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that there's a publish_future_post job scheduled at the right time.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $future_date, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $future_date, $this->next_schedule_for_post( 'publish_future_post', $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now delete the post and make sure the cron entry is removed.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_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->assertFalse( $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->next_schedule_for_post( 'publish_future_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">@@ -558,7 +558,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_permalink_without_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_permalink_without_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,7 +579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_option( 'siteurl' ) . '/2007/10/31/' . $id . '/', $plink );
</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">- function test_wp_publish_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $draft_id = self::factory()->post->create( array( 'post_status' => 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $draft_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22944
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_and_wp_publish_post_with_future_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_and_wp_publish_post_with_future_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date = gmdate( 'Y-m-d H:i:s', time() + 10000000 );
</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"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,7 +617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48145
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_should_default_to_publish_if_post_date_is_within_59_seconds_from_current_time() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_should_default_to_publish_if_post_date_is_within_59_seconds_from_current_time() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $future_date = gmdate( 'Y-m-d H:i:s', time() + 59 );
</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"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22944
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_publish_post_with_content_filtering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_publish_post_with_content_filtering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> kses_remove_filters();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_post( array( 'post_title' => '<script>Test</script>' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22944
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_publish_post_and_avoid_content_filtering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_publish_post_and_avoid_content_filtering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> kses_remove_filters();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = wp_insert_post( array( 'post_title' => '<script>Test</script>' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,7 +678,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23708
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_ancestors_within_loop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_ancestors_within_loop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get( array( 'post_parent' => $parent_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,7 +688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23474
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_invalid_post_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_invalid_post_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id, ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,7 +702,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">- function test_parse_post_content_single_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_post_content_single_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'Page 0' ), $pages );
</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">- function test_parse_post_content_multi_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_post_content_multi_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,7 +724,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'Page 0', 'Page 1', 'Page 2', 'Page 3' ), $pages );
</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">- function test_parse_post_content_remaining_single_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_post_content_remaining_single_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'Page 0' ), $pages );
</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">- function test_parse_post_content_remaining_multi_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_post_content_remaining_multi_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -749,7 +749,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parse_post_content_starting_with_nextpage() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_post_content_starting_with_nextpage() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => '<!--nextpage-->Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,7 +763,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parse_post_content_starting_with_nextpage_multi() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_post_content_starting_with_nextpage_multi() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => '<!--nextpage-->Page 0' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,8 +777,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19373
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_insert_programmatic_sanitized() {
- $this->_unset_current_user();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_programmatic_sanitized() {
+ $this->unset_current_user();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'test_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,7 +804,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24803
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_count_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(
</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"> $this->assertEquals( new stdClass, wp_count_posts( $post_type, 'readable' ) );
</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">- function test_wp_count_posts_filtered() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_posts_filtered() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,12 +839,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_count_posts', array( $this, 'filter_wp_count_posts' ) );
</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">- function filter_wp_count_posts( $counts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_wp_count_posts( $counts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $counts->publish = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> return $counts;
</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">- function test_wp_count_posts_insert_invalidation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_posts_insert_invalidation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_ids = self::factory()->post->create_many( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_counts = wp_count_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,7 +862,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $initial_counts->publish, $after_draft_counts->publish );
</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">- function test_wp_count_posts_trash_invalidation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_posts_trash_invalidation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_ids = self::factory()->post->create_many( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_counts = wp_count_posts();
</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"> * @ticket 49685
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_count_posts_status_changes_visible() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_posts_status_changes_visible() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Trigger a cache.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,7 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25566
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_tag_cloud_link_with_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_tag_cloud_link_with_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'new_post_type';
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = 'new_tag';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type, array( 'taxonomies' => array( 'post_tag', $tax ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -932,7 +932,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_utf8mb3_post_saves_with_emoji() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_utf8mb3_post_saves_with_emoji() {
</ins><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"> if ( 'utf8' !== $wpdb->get_col_charset( $wpdb->posts, 'post_title' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31168
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_default_comment_ping_status_open() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_default_comment_ping_status_open() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -986,7 +986,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31168
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_page_default_comment_ping_status_closed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_page_default_comment_ping_status_closed() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1005,7 +1005,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31168
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_cpt_default_comment_ping_status_open() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_cpt_default_comment_ping_status_open() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type, array( 'supports' => array( 'comments', 'trackbacks' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1027,7 +1027,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31168
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_cpt_default_comment_ping_status_closed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_cpt_default_comment_ping_status_closed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1052,7 +1052,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24153
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_without_publish_cannot_affect_sticky() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_without_publish_cannot_affect_sticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$grammarian_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanity check.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1090,7 +1090,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24153
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_without_publish_cannot_affect_sticky_with_edit_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_without_publish_cannot_affect_sticky_with_edit_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a sticky post.
</span><span class="cx" style="display: block; padding: 0 10px"> $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">@@ -1130,7 +1130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35600
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hooks_fire_when_post_gets_stuck_and_unstuck() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hooks_fire_when_post_gets_stuck_and_unstuck() {
</ins><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"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</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"> * @ticket 34865
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_updates_without_slug_provided() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_updates_without_slug_provided() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Stuff',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1199,7 +1199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15946
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_should_respect_post_date_gmt() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_should_respect_post_date_gmt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1220,7 +1220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post['post_date_gmt'], $out->post_date_gmt );
</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">- function test_wp_delete_post_reassign_hierarchical_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_delete_post_reassign_hierarchical_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $grandparent_page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_page_id = self::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">@@ -1247,7 +1247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _wp_customize_changeset_filter_insert_post_data()
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30937
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_insert_post_for_customize_changeset_should_not_drop_post_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_post_for_customize_changeset_should_not_drop_post_name() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_filter( 'wp_insert_post_data', '_wp_customize_changeset_filter_insert_post_data' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1300,7 +1300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_unique_post_slug()
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21112
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_wp_unique_post_slug_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_wp_unique_post_slug_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_wp_unique_post_slug', array( $this, 'filter_pre_wp_unique_post_slug' ), 10, 6 );
</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(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1316,7 +1316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_wp_unique_post_slug', array( $this, 'filter_pre_wp_unique_post_slug' ), 10, 6 );
</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">- function filter_pre_wp_unique_post_slug( $default, $slug, $post_ID, $post_status, $post_type, $post_parent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_wp_unique_post_slug( $default, $slug, $post_ID, $post_status, $post_type, $post_parent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'override-slug-' . $post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1606,7 +1606,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52187
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_resolve_post_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_resolve_post_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_date = '2020-12-28 11:26:35';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = '2020-12-29 10:11:45';
</span><span class="cx" style="display: block; padding: 0 10px"> $invalid_date = '2020-12-41 14:15:27';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1644,7 +1644,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::stick_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">- function test_stick_post_updates_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_stick_post_updates_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> stick_post( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 1 ), get_option( 'sticky_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1661,7 +1661,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $stick Value to pass to stick_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">- function test_stick_post_does_not_duplicate_post_ids( $stick ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_stick_post_does_not_duplicate_post_ids( $stick ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( 1, 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> stick_post( $stick );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1677,7 +1677,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type mixed $stick Value to pass to stick_post().
</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">- function data_stick_post_does_not_duplicate_post_ids() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_stick_post_does_not_duplicate_post_ids() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1 ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '1' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1693,7 +1693,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $stick Value to pass to stick_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">- function test_stick_post_removes_duplicate_post_ids_when_adding_new_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_stick_post_removes_duplicate_post_ids_when_adding_new_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( 1, 1, 2, 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> stick_post( 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1705,7 +1705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::unstick_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">- function test_unstick_post_updates_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unstick_post_updates_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> unstick_post( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_option( 'sticky_posts' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1727,7 +1727,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $unstick Parameter passed to `unstick_post()`
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $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">- function test_unstick_post_removes_duplicate_post_ids( $starting_option, $unstick, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unstick_post_removes_duplicate_post_ids( $starting_option, $unstick, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', $starting_option );
</span><span class="cx" style="display: block; padding: 0 10px"> unstick_post( $unstick );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $expected, get_option( 'sticky_posts' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1744,7 +1744,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $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">- function data_unstick_post_removes_duplicate_post_ids() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_unstick_post_removes_duplicate_post_ids() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, 1 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1780,7 +1780,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52007
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::stick_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">- function test_stick_post_with_duplicate_post_id_does_not_update_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_stick_post_with_duplicate_post_id_does_not_update_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( 1, 2, 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> stick_post( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 1, 2, 2 ), get_option( 'sticky_posts' ) );
</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"> * @ticket 52007
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::unstick_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">- function test_unstick_post_with_non_sticky_post_id_does_not_update_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unstick_post_with_non_sticky_post_id_does_not_update_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( 1, 2, 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> unstick_post( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 1, 2, 2 ), get_option( 'sticky_posts' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/conditionals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/conditionals.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected $page_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comments_per_page', 5 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,12 +25,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</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">- function test_home() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_home() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_home', 'is_front_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">- function test_page_on_front() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_on_front() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_on_front = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,18 +56,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'page_for_posts' );
</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">- function test_404() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_404() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/notapage' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_404' );
</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">- function test_permalink() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_permalink() {
</ins><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"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_single', 'is_singular' );
</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">- function test_post_comments_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_comments_feed() {
</ins><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"> self::factory()->comment->create_post_comments( $post_id, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_comments_feed_link( $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,13 +75,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_comments_feed_with_no_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_comments_feed_with_no_comments() {
</ins><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"> $this->go_to( get_post_comments_feed_link( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_feed', 'is_single', 'is_singular', 'is_comment_feed' );
</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">- function test_attachment_comments_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attachment_comments_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->comment->create_post_comments( $attachment_id, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_comments_feed_link( $attachment_id ) );
</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"> $this->assertQueryTrue( 'is_feed', 'is_attachment', 'is_single', 'is_singular', 'is_comment_feed' );
</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">- function test_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_page', 'is_singular' );
</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">- function test_parent_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_page', 'is_singular' );
</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">- function test_child_page_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_child_page_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_page', 'is_singular' );
</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">- function test_child_page_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_child_page_2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/trackback/?$' => 'index.php?pagename=$matches[1]&tb=1'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_trackback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_trackback() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::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">@@ -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><span class="cx" style="display: block; padding: 0 10px"> // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::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">@@ -233,7 +233,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">- function test_page_feed_with_no_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_feed_with_no_comments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::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">@@ -271,7 +271,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"> // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_feed_atom() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_feed_atom() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::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">@@ -311,7 +311,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"> // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_page_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_page_2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="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">
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_page_2_no_slash() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_page_2_no_slash() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="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">
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)(/[0-9]+)?/?$' => 'index.php?pagename=$matches[1]&page=$matches[2]'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pagination_of_posts_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pagination_of_posts_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_main_feed_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_main_feed_2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(); // @test_404
</span><span class="cx" style="display: block; padding: 0 10px"> $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +398,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">- function test_main_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_main_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(); // @test_404
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'rss2', 'rss', 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $types as $type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,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"> // 'page/?([0-9]{1,})/?$' => 'index.php?&paged=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 2; $i <= 3; $i++ ) {
</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"> // 'comments/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'comments/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_main_comments_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_main_comments_feed() {
</ins><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"> self::factory()->comment->create_post_comments( $post_id, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'search/(.+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?s=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'search/(.+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?s=$matches[1]&feed=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check the long form.
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $types as $type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +462,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"> // 'search/(.+)/page/?([0-9]{1,})/?$' => 'index.php?s=$matches[1]&paged=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3, array( 'post_title' => 'test' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/search/test/page/2/' );
</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"> // 'search/(.+)/?$' => 'index.php?s=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/search/test/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_search' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13961
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search_encoded_chars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_encoded_chars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/search/F%C3%BCnf%2Bbar/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_query_var( 's' ), 'Fünf+bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> // 'category/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'category/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_category_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->term->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'cat-a',
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'category/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?category_name=$matches[1]&paged=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_category_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/category/uncategorized/page/2/' );
</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"> // 'category/(.+?)/?$' => 'index.php?category_name=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_category() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->term->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'cat-a',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'tag/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'tag/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->term->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'tag-a',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +553,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"> // 'tag/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?tag=$matches[1]&paged=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = self::factory()->post->create_many( 3 );
</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">@@ -564,7 +564,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"> // 'tag/(.+?)/?$' => 'index.php?tag=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->term->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Tag Named A',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,7 +589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'author/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'author/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_author_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->user->create( array( 'user_login' => 'user-a' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the long form.
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,7 +607,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"> // 'author/([^/]+)/page/?([0-9]{1,})/?$' => 'index.php?author_name=$matches[1]&paged=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_author_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'user_login' => 'user-a' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3, array( 'post_author' => $user_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,7 +616,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"> // 'author/([^/]+)/?$' => 'index.php?author_name=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'user_login' => 'user-a' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_author' => $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/author/user-a/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,7 +623,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_archive', 'is_author' );
</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">- function test_author_with_no_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_with_no_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'user_login' => 'user-a' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/author/user-a/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_archive', 'is_author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,7 +631,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ymd_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ymd_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the long form.
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,7 +649,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"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&paged=$matches[4]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ymd_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ymd_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2007/09/04/page/2/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,7 +657,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"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ymd() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ymd() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2007/09/04/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_archive', 'is_day', 'is_date' );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ym_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ym_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the long form.
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&paged=$matches[3]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ym_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ym_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2007/09/page/2/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,7 +691,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"> // '([0-9]{4})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ym() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ym() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2007/09/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_archive', 'is_date', 'is_month' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_y_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_y_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the long form.
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +717,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"> // '([0-9]{4})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&paged=$matches[2]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_y_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_y_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2007/page/2/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +725,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"> // '([0-9]{4})/?$' => 'index.php?year=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_y() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_y() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2007/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_archive', 'is_date', 'is_year' );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/trackback/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&tb=1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_trackback() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_trackback() {
</ins><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"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "{$permalink}trackback/" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,7 +741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_comment_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_comment_feed() {
</ins><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"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the long form.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +760,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"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)(/[0-9]+)?/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&page=$matches[5]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_paged_short() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_paged_short() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-09-04 00:00:00',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,7 +775,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"> // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/([^/]+)/?$' => 'index.php?attachment=$matches[1]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_attachment_link( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $permalink );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +793,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage WP_Date_Query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bad_dates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bad_dates() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/2013/13/13/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_404' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,7 +801,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_404' );
</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">- function test_post_type_archive_with_tax_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_archive_with_tax_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'rewrite_rules' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_name = 'ptawtq';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,7 +832,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_tax_query' ) );
</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">- function pre_get_posts_with_tax_query( &$query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function pre_get_posts_with_tax_query( &$query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'slug', 'tag-slug', 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_query',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,7 +846,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">- function test_post_type_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_type_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'rewrite_rules' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_name = 'thearray';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,11 +874,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_type_array' ) );
</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">- function pre_get_posts_with_type_array( &$query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function pre_get_posts_with_type_array( &$query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'post_type', array( 'post', 'thearray' ) );
</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">- function test_is_single() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_single() {
</ins><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"> $this->go_to( "/?p=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,7 +898,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16802
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_single_with_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_single_with_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Use custom hierarchical post type.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'test_hierarchical';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1005,7 +1005,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38225
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_single_with_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_single_with_attachment() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1025,7 +1025,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $q->is_attachment );
</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">- function test_is_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,7 +1045,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16802
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_page_with_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page_with_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,7 +1079,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_page( '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">- function test_is_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?attachment_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1236,7 +1236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $q->is_page( $p2 ) );
</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">- function test_is_page_template() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page_template() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wp_page_template', 'example.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1246,7 +1246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31271
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_page_template_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page_template_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_page_template( 'default' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1256,7 +1256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31271
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_page_template_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page_template_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wp_page_template', 'example.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1267,7 +1267,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18375
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_page_template_other_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page_template_other_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wp_page_template', 'example.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_permalink( $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1278,7 +1278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39211
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_page_template_not_singular() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_page_template_not_singular() {
</ins><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"> // We need a non-post that shares an ID with a post assigned a template.
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryisTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/isTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/isTerm.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query/isTerm.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected $tag;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $tax;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_the_query'] = new WP_Query();
</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"> add_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
</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">- function test_tag_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Tag with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( '/tag/tag-slug/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_tag', 'is_archive' );
</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"> $this->assertEquals( get_queried_object(), $this->tag );
</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">- function test_tag_query_cat_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_query_cat_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Tag + category with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( "/tag/tag-slug/?cat=$this->cat_id" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_category', 'is_tag', 'is_archive' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_queried_object(), $this->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">- function test_tag_query_cat_query_tax_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_query_cat_query_tax_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Tag + category + tax with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( "/tag/tag-slug/?cat=$this->cat_id&testtax=tax-slug2" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_category', 'is_tag', 'is_tax', 'is_archive' );
</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->assertEquals( get_queried_object(), $this->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">- function test_cat_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cat_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Category with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( '/category/cat-slug/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_category', 'is_archive' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,9 +113,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26627
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_cat_uncat_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cat_uncat_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Category with taxonomy added.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'pre_get_posts', array( $this, '_cat_uncat_action_tax' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'pre_get_posts', array( $this, 'cat_uncat_action_tax' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( '/category/uncategorized/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_category', 'is_archive' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,10 +125,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( get_query_var( 'term_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_queried_object(), $this->uncat );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'pre_get_posts', array( $this, '_cat_uncat_action_tax' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'pre_get_posts', array( $this, 'cat_uncat_action_tax' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _cat_uncat_action_tax( &$query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function cat_uncat_action_tax( &$query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $query->is_category() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $query->is_archive() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $query->get( 'category_name' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26728
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tax_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tax_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Taxonomy with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( '/testtax/tax-slug2/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_tax', 'is_archive' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_queried_object(), get_term( $this->tax_id, 'testtax' ) );
</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">- function test_tax_query_tag_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tax_query_tag_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Taxonomy + tag with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( "/testtax/tax-slug2/?tag_id=$this->tag_id" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_tag', 'is_tax', 'is_archive' );
</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"> $this->assertEquals( get_queried_object(), $this->tag );
</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">- function test_tax_query_cat_action_tax() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tax_query_cat_action_tax() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Taxonomy + category with taxonomy added.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( "/testtax/tax-slug2/?cat=$this->cat_id" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_category', 'is_tax', 'is_archive' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_queried_object(), $this->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">- function pre_get_posts_tax_category_tax_query( &$query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function pre_get_posts_tax_category_tax_query( &$query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_query',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/results.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query/results.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$post_ids[] = self::$child_four;
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->q );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->q = new WP_Query();
</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">- function test_query_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The output should be the most recent 10 posts as listed here.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_list_pluck( $posts, 'post_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag_a() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag_a() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag=tag-a' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There are 4 posts with Tag A.
</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"> $this->assertSame( 'tags-a-b-c', $posts[3]->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag_b() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag_b() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag=tag-b' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There are 4 posts with Tag A.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21779
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag_nun() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag_nun() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag=tag-נ' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There is 1 post with Tag נ.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'tag-%d7%a0', $posts[0]->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = tag_exists( 'tag-a' );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag_id=' . $tag['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'tags-a-b-c', $posts[3]->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag_slug__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag_slug__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag_slug__in[]=tag-b&tag_slug__in[]=tag-c' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There are 4 posts with either Tag B or Tag C.
</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"> }
</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">- function test_query_tag__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag_a = tag_exists( 'tag-a' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_b = tag_exists( 'tag-b' );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag__in[]=' . $tag_a['term_id'] . '&tag__in[]=' . $tag_b['term_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'tags-a-b-c', $posts[5]->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag__not_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag__not_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag_a = tag_exists( 'tag-a' );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag__not_in[]=' . $tag_a['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_list_pluck( $posts, 'post_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_tag__in_but__not_in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_tag__in_but__not_in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag_a = tag_exists( 'tag-a' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_b = tag_exists( 'tag-b' );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'tag__in[]=' . $tag_a['term_id'] . '&tag__not_in[]=' . $tag_b['term_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,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">- function test_query_category_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_category_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'category_name=cat-a' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // There are 4 posts with Cat A, we'll check for them by name.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +441,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'cats-a-b-c', $posts[3]->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_cat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_cat() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat = category_exists( 'cat-b' );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( "cat=$cat" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'cats-a-b-c', $posts[3]->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_posts_per_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_posts_per_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'posts_per_page=5' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</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"> $this->assertSame( $expected, wp_list_pluck( $posts, 'post_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_offset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_offset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'offset=2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</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"> $this->assertSame( $expected, wp_list_pluck( $posts, 'post_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_paged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_paged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'paged=2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</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"> $this->assertSame( $expected, wp_list_pluck( $posts, 'post_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_paged_and_posts_per_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_paged_and_posts_per_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( 'paged=4&posts_per_page=4' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11056
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_post_parent__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_post_parent__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Query for first parent's children.
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11056
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post_parent__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post_parent__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent__in' => array( self::$parent_two, self::$parent_one ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,7 +617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post_parent__in_with_order_desc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post_parent__in_with_order_desc() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_parent__in_array = array( self::$parent_two, self::$parent_one );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_returned_array = array( 'child-three', 'child-four', 'child-one', 'child-two' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,7 +636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post__in_with_no_order_specified() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post__in_with_no_order_specified() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post__in_array = array( self::$post_ids[2], self::$post_ids[0], self::$post_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_returned_array = array( self::$post_ids[2], self::$post_ids[0], self::$post_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,7 +655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post__in_with_order_asc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post__in_with_order_asc() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post__in_array = array( self::$post_ids[2], self::$post_ids[0], self::$post_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_returned_array = array( self::$post_ids[2], self::$post_ids[0], self::$post_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post__in_with_order_desc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post__in_with_order_desc() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post__in_array = array( self::$post_ids[1], self::$post_ids[2], self::$post_ids[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_returned_array = array( self::$post_ids[1], self::$post_ids[2], self::$post_ids[0] );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post_name__in_with_order_asc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post_name__in_with_order_asc() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_name__in_array = array( 'parent-two', 'parent-one', 'parent-three' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_orderby_post_name__in_with_order_desc() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_orderby_post_name__in_with_order_desc() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_name__in_array = array( 'parent-two', 'parent-one', 'parent-three' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query(
</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"> * @ticket 27252
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31194
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_fields_integers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_fields_integers() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parents = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (int) self::$parent_one,
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28099
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_post__in() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_post__in() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts1 = $this->q->query( array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $posts1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts2 = $this->q->query( array( 'post__in' => array() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,7 +786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19198
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_exclude_from_search_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exclude_from_search_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_post_types;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $wp_post_types ) as $slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_post_types[ $slug ]->exclude_from_search = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,7 +810,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16854
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_author_vars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_author_vars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_1 = self::factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'author1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -982,7 +982,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 10935
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_query_is_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_is_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => '2007',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,7 +1040,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->q->is_year );
</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">- function test_perm_with_status_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_perm_with_status_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,7 +1059,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20308
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $one = (string) self::factory()->post->create( array( 'post_password' => '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $two = (string) self::factory()->post->create( array( 'post_password' => 'burrito' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $three = (string) self::factory()->post->create( array( 'post_password' => 'burrito' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1150,7 +1150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28611
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_duplicate_slug_in_hierarchical_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_duplicate_slug_in_hierarchical_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'handbook', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_1 = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1185,7 +1185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29615
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_child_post_in_hierarchical_post_type_with_default_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_child_post_in_hierarchical_post_type_with_default_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'handbook', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_1 = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1213,7 +1213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_title() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_title() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = 'Tacos are Cool';
</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"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsquerysearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/search.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query/search.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> protected $q;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $post_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_type = rand_str( 12 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,13 +16,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->q = new WP_Query();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $this->q );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function get_search_results( $terms ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_search_results( $terms ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = http_build_query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => $terms,
</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"> return $this->q->query( $args );
</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">- function test_search_order_title_relevance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_order_title_relevance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 7 ) as $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::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">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post_id, reset( $posts )->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">- function test_search_terms_query_var() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search_terms_query_var() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = 'This is a search term';
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query( array( 's' => 'This is a search term' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( explode( ' ', $terms ), $query->get( 'search_terms' ) );
</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"> $this->assertSame( array( 'search', 'term' ), $query->get( 'search_terms' ) );
</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">- function test_filter_stopwords() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_stopwords() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = 'This is a search term';
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_search_stopwords', array( $this, 'filter_wp_search_stopwords' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query( array( 's' => $terms ) );
</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"> $this->assertSame( array( 'This', 'is', 'search', 'term' ), $query->get( 'search_terms' ) );
</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">- function filter_wp_search_stopwords() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_wp_search_stopwords() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 38099
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_disable_search_exclusion_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_disable_search_exclusion_prefix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = '-HYPHENATION_TEST';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a post with a title which starts with a hyphen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38099
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_change_search_exclusion_prefix() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_change_search_exclusion_prefix() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = '#OCTOTHORPE_TEST';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a post with a title that starts with a non-hyphen prefix.
</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"> $this->assertSame( array(), $found );
</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">- function filter_search_exclusion_prefix_octothorpe() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_search_exclusion_prefix_octothorpe() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '#';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsquerysetupPostdataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/setupPostdata.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/setupPostdata.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query/setupPostdata.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * setup_postdata( $a_post ) followed by the_content() without updating global $post
</span><span class="cx" style="display: block; padding: 0 10px"> * should use the content of $a_post rather then the global 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">- function test_setup_postdata_with_the_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_setup_postdata_with_the_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => 'global post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_query']->post = $GLOBALS['post'];
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryverboseRewriteRulesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/verboseRewriteRules.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/verboseRewriteRules.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query/verboseRewriteRules.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @group rewrite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query_VerbosePageRules extends Tests_Query_Conditionals {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%category%/%year%/%postname%/' );
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/query.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24785
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_nested_loop_reset_postdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nested_loop_reset_postdata() {
</ins><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"> $nested_post_id = self::factory()->post->create();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16471
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_query_var() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_query_var() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $query->get( 'nonexistent' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $query->get( 'nonexistent', false ) );
</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"> * @ticket 25380
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pre_posts_per_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pre_posts_per_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many( 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( $this, 'filter_posts_per_page' ) );
</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->assertSame( 30, get_query_var( 'posts_per_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">- function filter_posts_per_page( &$query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_posts_per_page( &$query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'posts_per_rss', 30 );
</span><span class="cx" style="display: block; padding: 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,12 +59,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26627
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_queried_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_queried_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $slug = 'tag-slug-26627';
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->tag->create( array( 'slug' => $slug ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = get_term_by( 'slug', $slug, 'post_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">- add_action( 'pre_get_posts', array( $this, '_tag_queried_object' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'pre_get_posts', array( $this, 'tag_queried_object' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_term_link( $tag ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,10 +75,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, get_query_var( 'tag_slug__in' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_queried_object(), $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">- remove_action( 'pre_get_posts', array( $this, '_tag_queried_object' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'pre_get_posts', array( $this, 'tag_queried_object' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _tag_queried_object( &$query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tag_queried_object( &$query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = get_term_by( 'slug', 'tag-slug-26627', 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $query->is_tag() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $query->is_archive() );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestuserscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1278,7 +1278,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">- function get_illegal_user_logins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_illegal_user_logins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'nope' );
</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="trunktestsphpunittestsrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/rest-api.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks that the main classes are loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_rest_api_active() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_api_active() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( class_exists( 'WP_REST_Server' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( class_exists( 'WP_REST_Request' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( class_exists( 'WP_REST_Response' ) );
</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"> * The rest_api_init hook should have been registered with init, and should
</span><span class="cx" style="display: block; padding: 0 10px"> * have a default priority of 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">- function test_init_action_added() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_init_action_added() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_action( 'init', 'rest_api_init' ) );
</span><span class="cx" style="display: block; padding: 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,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The rest_route query variable should be registered.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_rest_route_query_var() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_route_query_var() {
</ins><span class="cx" style="display: block; padding: 0 10px"> rest_api_init();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'rest_route', $GLOBALS['wp']->public_query_vars );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -933,7 +933,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $routes['/test-ns/test'][0]['methods'], array( 'GET' => 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">- function test_rest_preload_api_request_with_method() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_preload_api_request_with_method() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $rest_server = $GLOBALS['wp_rest_server'];
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_rest_server'] = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,7 +957,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51636
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_rest_preload_api_request_removes_trailing_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_preload_api_request_removes_trailing_slashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $rest_server = $GLOBALS['wp_rest_server'];
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_rest_server'] = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -982,7 +982,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40614
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_rest_ensure_request_accepts_path_string() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_ensure_request_accepts_path_string() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = rest_ensure_request( '/wp/v2/posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_REST_Request', $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '/wp/v2/posts', $request->get_route() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,13 +990,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_parse_embed_param
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_parse_embed_param
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_parse_embed_param( $expected, $embed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, rest_parse_embed_param( $embed ) );
</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">- public function _dp_rest_parse_embed_param() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_parse_embed_param() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( true, '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( true, null ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,7 +1019,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48819
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_filter_response_by_context
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_filter_response_by_context
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_filter_response_by_context( $schema, $data, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, rest_filter_response_by_context( $data, $schema, 'view' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1106,7 +1106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $registered );
</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">- public function _dp_rest_filter_response_by_context() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_filter_response_by_context() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1777,7 +1777,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">- function test_rest_ensure_response_accepts_wp_error_and_returns_wp_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_ensure_response_accepts_wp_error_and_returns_wp_error() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_ensure_response( new WP_Error() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $response );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1788,7 +1788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $response The response passed to rest_ensure_response().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $expected_data The expected data a response should include.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_rest_ensure_response_returns_instance_of_wp_rest_response( $response, $expected_data ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_rest_ensure_response_returns_instance_of_wp_rest_response( $response, $expected_data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $response_object = rest_ensure_response( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_REST_Response', $response_object );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_data, $response_object->get_data() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1799,7 +1799,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function rest_ensure_response_data_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function rest_ensure_response_data_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( null, null ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( array( 'chocolate' => 'cookies' ), array( 'chocolate' => 'cookies' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2009,7 +2009,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50300
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_is_object
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_is_object
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected result of the check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to check.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2024,7 +2024,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">- public function _dp_rest_is_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_is_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2072,7 +2072,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50300
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_sanitize_object
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_sanitize_object
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected Expected sanitized version.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to sanitize.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2082,7 +2082,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $sanitized );
</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">- public function _dp_rest_sanitize_object() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_sanitize_object() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2130,7 +2130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50300
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_is_array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_is_array
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected result of the check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to check.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2145,7 +2145,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">- public function _dp_rest_is_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_is_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2201,7 +2201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50300
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_sanitize_array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_sanitize_array
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected Expected sanitized version.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to sanitize.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2211,7 +2211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $sanitized );
</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">- public function _dp_rest_sanitize_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_sanitize_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2271,7 +2271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51146
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_rest_is_integer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_rest_is_integer
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected result of the check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to check.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2286,7 +2286,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">- public function _dp_rest_is_integer() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_rest_is_integer() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2334,7 +2334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 50300
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_get_best_type_for_value
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_get_best_type_for_value
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected The expected best type.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to test.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2344,7 +2344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, rest_get_best_type_for_value( $value, $types ) );
</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">- public function _dp_get_best_type_for_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_get_best_type_for_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'array',
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/rewrite.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Rewrite extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> private $home_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</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"> $this->home_url = get_option( 'home' );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->init();
</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"> $this->assertStringContainsString( $redirect, $extra_rules_top[ $pattern ] );
</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">- function test_url_to_postid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, url_to_postid( get_permalink( $id ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, url_to_postid( get_permalink( $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">- function test_url_to_postid_set_url_scheme_https_to_http() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_set_url_scheme_https_to_http() {
</ins><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"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
</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"> $this->assertSame( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
</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">- function test_url_to_postid_set_url_scheme_http_to_https() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_set_url_scheme_http_to_https() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,13 +124,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_url_to_postid_of_http_site_when_current_site_uses_https() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_of_http_site_when_current_site_uses_https() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $network_home = home_url();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->blog_id_35531 = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'home_url', array( $this, '_filter_http_home_url' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'home_url', array( $this, 'filter_http_home_url' ), 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $this->blog_id_35531 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'home_url', array( $this, '_filter_http_home_url' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'home_url', array( $this, 'filter_http_home_url' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test the tests.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http', parse_url( $permalink, PHP_URL_SCHEME ) );
</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"> * @param int|null $blog_id Site ID, or null for the current site.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The complete home URL including scheme and 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">- function _filter_http_home_url( $url, $path, $orig_scheme, $_blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_http_home_url( $url, $path, $orig_scheme, $_blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $blog_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->blog_id_35531 === $blog_id ) {
</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"> return $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">- function test_url_to_postid_custom_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_custom_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'rewrite_rules' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 12 );
</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"> _unregister_post_type( $post_type );
</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">- function test_url_to_postid_hierarchical() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_hierarchical() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::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">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $child_id, url_to_postid( get_permalink( $child_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">- function test_url_to_postid_hierarchical_with_matching_leaves() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_hierarchical_with_matching_leaves() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::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">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $grandchild_id_2, url_to_postid( get_permalink( $grandchild_id_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">- function test_url_to_postid_home_has_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_home_has_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_url( '/example/' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30438
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parse_request_home_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_request_home_path() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $home_url = home_url( '/path/' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', $home_url );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30438
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parse_request_home_path_with_regex_character() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_request_home_path_with_regex_character() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $home_url = home_url( '/ma.ch/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $not_a_home_url = home_url( '/match/' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', $home_url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30018
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parse_request_home_path_non_public_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_request_home_path_non_public_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'foo', '1', home_url() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $GLOBALS['wp']->query_vars );
</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">- function test_url_to_postid_dupe_path() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_dupe_path() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', home_url( '/example/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->post->create(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Reveals bug introduced in WP 3.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">- function test_url_to_postid_home_url_collision() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_home_url_collision() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', home_url( '/example' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_url_to_postid_ms_home_url_collision() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_ms_home_url_collision() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'path' => '/example' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21970
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_url_to_postid_with_post_slug_that_clashes_with_a_trashed_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_with_post_slug_that_clashes_with_a_trashed_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</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"> * @ticket 34971
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_url_to_postid_static_front_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_url_to_postid_static_front_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, url_to_postid( home_url() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21970
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_parse_request_with_post_slug_that_clashes_with_a_trashed_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parse_request_with_post_slug_that_clashes_with_a_trashed_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create(
</span></span></pre></div>
<a id="trunktestsphpunittestsshortcodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/shortcode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/shortcode.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/shortcode.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,11 +6,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar', 'url', 'img' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->shortcodes as $shortcode ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_shortcode( $shortcode, array( $this, '_shortcode_' . str_replace( '-', '_', $shortcode ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_shortcode( $shortcode, array( $this, 'shortcode_' . str_replace( '-', '_', $shortcode ) ) );
</ins><span class="cx" style="display: 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->atts = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->shortcodes as $shortcode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $shortcode_tags[ $shortcode ] );
</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"> parent::tear_down();
</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">- function _shortcode_test_shortcode_tag( $atts, $content = null, $tagname = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_test_shortcode_tag( $atts, $content = null, $tagname = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->atts = $atts;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->content = $content;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->tagname = $tagname;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,13 +37,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"> // [footag foo="bar"]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _shortcode_footag( $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_footag( $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $foo = isset( $atts['foo'] ) ? $atts['foo'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> return "foo = $foo";
</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"> // [bartag foo="bar"]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _shortcode_bartag( $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_bartag( $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $processed_atts = shortcode_atts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'no foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,11 +57,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"> // [baztag]content[/baztag]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _shortcode_baztag( $atts, $content = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_baztag( $atts, $content = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'content = ' . do_shortcode( $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">- function _shortcode_dumptag( $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_dumptag( $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= "$k = $v\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,23 +69,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</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">- function _shortcode_hyphen() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_hyphen() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __FUNCTION__;
</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">- function _shortcode_hyphen_foo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_hyphen_foo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __FUNCTION__;
</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">- function _shortcode_hyphen_foo_bar() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_hyphen_foo_bar() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __FUNCTION__;
</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">- function _shortcode_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'http://www.wordpress.org/';
</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">- function _shortcode_img( $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_img( $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = '<img';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= " $k=\"$v\"";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,19 +95,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</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">- function test_noatts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_noatts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $this->atts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_one_att() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_one_att() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag foo="asdf" /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'foo' => 'asdf' ), $this->atts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_not_a_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_not_a_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[not-a-shortcode-tag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[not-a-shortcode-tag]', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,17 +115,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17657
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_hyphen_not_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_hyphen_not_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[dumptag-notreal]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[dumptag-notreal]', $out );
</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">- function test_tag_underscore_not_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_underscore_not_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[dumptag_notreal]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[dumptag_notreal]', $out );
</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">- function test_tag_not_tag() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_not_tag() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[dumptagnotreal]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[dumptagnotreal]', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,10 +133,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17657
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_hyphen() {
- $this->assertSame( '_shortcode_hyphen', do_shortcode( '[hyphen]' ) );
- $this->assertSame( '_shortcode_hyphen_foo', do_shortcode( '[hyphen-foo]' ) );
- $this->assertSame( '_shortcode_hyphen_foo_bar', do_shortcode( '[hyphen-foo-bar]' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_hyphen() {
+ $this->assertSame( 'shortcode_hyphen', do_shortcode( '[hyphen]' ) );
+ $this->assertSame( 'shortcode_hyphen_foo', do_shortcode( '[hyphen-foo]' ) );
+ $this->assertSame( 'shortcode_hyphen_foo_bar', do_shortcode( '[hyphen-foo-bar]' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[hyphen-baz]', do_shortcode( '[hyphen-baz]' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[hyphen-foo-bar-baz]', do_shortcode( '[hyphen-foo-bar-baz]' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9405
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_attr_hyphen() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_attr_hyphen() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag foo="foo" foo-bar="foo-bar" foo-bar-="foo-bar-" -foo-bar="-foo-bar" -foo-bar-="-foo-bar-" foo-bar-baz="foo-bar-baz" -foo-bar-baz="-foo-bar-baz" foo--bar="foo--bar" /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_attrs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</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"> $this->assertSame( $expected_attrs, $this->atts );
</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">- function test_two_atts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_two_atts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag foo="asdf" bar="bing" /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_noatts_enclosing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_noatts_enclosing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag]content[/test-shortcode-tag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $this->atts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'content', $this->content );
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_one_att_enclosing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_one_att_enclosing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag foo="bar"]content[/test-shortcode-tag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'foo' => 'bar' ), $this->atts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'content', $this->content );
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_two_atts_enclosing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_two_atts_enclosing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[test-shortcode-tag foo="bar" baz="bing"]content[/test-shortcode-tag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_unclosed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unclosed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $this->atts );
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_positional_atts_num() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_atts_num() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag 123]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 0 => '123' ), $this->atts );
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_positional_atts_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_atts_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag https://www.youtube.com/watch?v=72xdCU__XCk]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 0 => 'https://www.youtube.com/watch?v=72xdCU__XCk' ), $this->atts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_positional_atts_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_atts_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag "something in quotes" "something else"]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_positional_atts_mixed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_atts_mixed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag 123 https://wordpress.org/ 0 "foo" bar]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_positional_and_named_atts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_and_named_atts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag 123 url=https://wordpress.org/ foo bar="baz"]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,18 +263,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test-shortcode-tag', $this->tagname );
</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">- function test_footag_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_footag_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[footag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo = ', $out );
</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">- function test_footag_val() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_footag_val() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $val = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[footag foo="' . $val . '"]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo = ' . $val, $out );
</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">- function test_nested_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_nested_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[baztag][dumptag abc="foo" def=123 https://wordpress.org/][/baztag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "content = abc = foo\ndef = 123\n0 = https://wordpress.org\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $out );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6518
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_tag_escaped() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_escaped() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[[footag]] [[bartag foo="bar"]]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[footag] [bartag foo="bar"]', $out );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +298,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[[footag]] [[bartag foo="bar"]]', $out );
</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">- function test_tag_not_escaped() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_tag_not_escaped() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // These have square brackets on either end but aren't actually escaped.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[[footag] [bartag foo="bar"]]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '[foo = foo = bar]', $out );
</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->assertSame( '[[foo = foo = bar]]', $out );
</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">- function test_mixed_tags() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_mixed_tags() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $in = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> So this is a post with [footag foo="some stuff"] and a bunch of tags.
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6562
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_utf8_whitespace_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_utf8_whitespace_1() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // NO-BREAK SPACE: U+00A0.
</span><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( "[test-shortcode-tag foo=\"bar\" \xC2\xA0baz=\"123\"]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> * @ticket 6562
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_utf8_whitespace_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_utf8_whitespace_2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // ZERO WIDTH SPACE: U+200B.
</span><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( "[test-shortcode-tag foo=\"bar\" \xE2\x80\x8Babc=\"def\"]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,13 +388,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14050
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shortcode_unautop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shortcode_unautop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // A blank line is added at the end, so test with it already there.
</span><span class="cx" style="display: block; padding: 0 10px"> $test_string = "[footag]\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $test_string, shortcode_unautop( wpautop( $test_string ) ) );
</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">- function data_test_strip_shortcodes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_test_strip_shortcodes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'before', 'before[gallery]' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'after', '[gallery]after' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected Expected output.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Content to run strip_shortcodes() on.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_shortcodes( $expected, $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_shortcodes( $expected, $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, strip_shortcodes( $content ) );
</span><span class="cx" style="display: block; padding: 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,18 +424,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37767
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_strip_shortcodes_filter() {
- add_filter( 'strip_shortcodes_tagnames', array( $this, '_filter_strip_shortcodes_tagnames' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_strip_shortcodes_filter() {
+ add_filter( 'strip_shortcodes_tagnames', array( $this, 'filter_strip_shortcodes_tagnames' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'beforemiddle [footag]after', strip_shortcodes( 'before[gallery]middle [footag]after' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'strip_shortcodes_tagnames', array( $this, '_filter_strip_shortcodes_tagnames' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'strip_shortcodes_tagnames', array( $this, 'filter_strip_shortcodes_tagnames' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _filter_strip_shortcodes_tagnames() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_strip_shortcodes_tagnames() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'gallery' );
</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"> // Store passed in shortcode_atts_{$shortcode} args.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _filter_atts( $out, $pairs, $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_atts( $out, $pairs, $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->filter_atts_out = $out;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->filter_atts_pairs = $pairs;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->filter_atts_atts = $atts;
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Filter shortcode atts in various ways.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _filter_atts2( $out, $pairs, $atts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_atts2( $out, $pairs, $atts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If foo attribute equals "foo1", change it to be default value.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $out['foo'] ) && 'foo1' === $out['foo'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out['foo'] = $pairs['foo'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,8 +458,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</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">- function test_shortcode_atts_filter_passes_original_arguments() {
- add_filter( 'shortcode_atts_bartag', array( $this, '_filter_atts' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shortcode_atts_filter_passes_original_arguments() {
+ add_filter( 'shortcode_atts_bartag', array( $this, 'filter_atts' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_shortcode( '[bartag foo="foo1" /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'foo' => 'foo1' ), $this->filter_atts_atts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'shortcode_atts_bartag', array( $this, '_filter_atts' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'shortcode_atts_bartag', array( $this, 'filter_atts' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_shortcode_atts_filtering() {
- add_filter( 'shortcode_atts_bartag', array( $this, '_filter_atts2' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_shortcode_atts_filtering() {
+ add_filter( 'shortcode_atts_bartag', array( $this, 'filter_atts2' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[bartag foo="foo1" baz="baz1" /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'foo' => 'no foo' ), $this->filter_atts_out );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[bartag foo="foo2" /]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo = foo2', $out );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'shortcode_atts_bartag', array( $this, '_filter_atts2' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'shortcode_atts_bartag', array( $this, 'filter_atts2' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22692
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_spaces_around_shortcodes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_spaces_around_shortcodes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nbsp = "\xC2\xA0";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $input = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,11 +521,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_escaping
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_escaping( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escaping( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, do_shortcode( $input ) );
</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">- function data_escaping() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_escaping() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<!--[if lt IE 7]>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,11 +599,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_escaping2
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_escaping2( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_escaping2( $input, $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->assertSame( $output, strip_shortcodes( $input ) );
</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">- function data_escaping2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_escaping2() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<!--[if lt IE 7]>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26343
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_has_shortcode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_shortcode() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = 'This is a blob with [gallery] in it';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_shortcode( $content, 'gallery' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @dataProvider data_registration_bad
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage add_shortcode
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_registration_bad( $input, $expected ) {
- return $this->sub_registration( $input, $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_registration_bad( $input, $expected ) {
+ $this->sub_registration( $input, $expected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,21 +664,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_registration_good
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_registration_good( $input, $expected ) {
- return $this->sub_registration( $input, $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_registration_good( $input, $expected ) {
+ $this->sub_registration( $input, $expected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function sub_registration( $input, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function sub_registration( $input, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( $input, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = shortcode_exists( $input );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test = $this->assertSame( $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"> if ( $actual ) {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_shortcode( $input );
</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 $test;
</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">- function data_registration_bad() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_registration_bad() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<html>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,7 +710,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">- function data_registration_good() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_registration_good() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'good!',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,13 +732,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_whole_posts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_pcre_performance( $input ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pcre_performance( $input ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $regex = '/' . get_shortcode_regex() . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> $result = benchmark_pcre_backtracking( $regex, $input, 'match_all' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->assertLessThan( 200, $result );
</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">- function data_whole_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_whole_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/formatting/whole-posts.php';
</span><span class="cx" style="display: block; padding: 0 10px"> return data_whole_posts();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,7 +749,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34191
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51734
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_php_and_js_shortcode_attribute_regexes_match() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_php_and_js_shortcode_attribute_regexes_match() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This test uses the source file by default but will use the built file if it exists.
</span><span class="cx" style="display: block; padding: 0 10px"> // This allows the test to run using either the src or build directory.
</span><span class="cx" style="display: block; padding: 0 10px"> $file_src = ABSPATH . 'js/_enqueues/wp/shortcode.js';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -780,7 +779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the (not recommended) [shortcode=XXX] format
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unnamed_attribute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unnamed_attribute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[dumptag=https://wordpress.org/]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "0 = =https://wordpress.org\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $out );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -789,7 +788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36306
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_smilies_arent_converted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_smilies_arent_converted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = apply_filters( 'the_content', '[img alt="Hello :-) World"]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<img alt=\"Hello :-) World\" />\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $out );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,17 +800,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pre_do_shortcode_tag() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Does nothing if no filters are set up.
</span><span class="cx" style="display: block; padding: 0 10px"> $str = 'pre_do_shortcode_tag';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_shortcode( $str, array( $this, '_shortcode_pre_do_shortcode_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_shortcode( $str, array( $this, 'shortcode_pre_do_shortcode_tag' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_nofilter = do_shortcode( "[{$str}]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $result_nofilter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Short-circuit with filter.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_do_shortcode_tag', array( $this, 'filter_pre_do_shortcode_tag_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_filter = do_shortcode( "[{$str}]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'bar', $result_filter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Respect priority.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_p11' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_do_shortcode_tag', array( $this, 'filter_pre_do_shortcode_tag_p11' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_priority = do_shortcode( "[{$str}]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'p11', $result_priority );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -833,29 +832,29 @@
</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">- add_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_attr' ), 12, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_do_shortcode_tag', array( $this, 'filter_pre_do_shortcode_tag_attr' ), 12, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_atts = do_shortcode( "[{$str} a='b' c='d']" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_json_encode( $arr ), $result_atts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_attr' ), 12, 4 );
- remove_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_p11' ), 11 );
- remove_filter( 'pre_do_shortcode_tag', array( $this, '_filter_pre_do_shortcode_tag_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'pre_do_shortcode_tag', array( $this, 'filter_pre_do_shortcode_tag_attr' ), 12, 4 );
+ remove_filter( 'pre_do_shortcode_tag', array( $this, 'filter_pre_do_shortcode_tag_p11' ), 11 );
+ remove_filter( 'pre_do_shortcode_tag', array( $this, 'filter_pre_do_shortcode_tag_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_shortcode( $str );
</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">- public function _shortcode_pre_do_shortcode_tag( $atts = array(), $content = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_pre_do_shortcode_tag( $atts = array(), $content = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">- public function _filter_pre_do_shortcode_tag_bar() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_do_shortcode_tag_bar() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'bar';
</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">- public function _filter_pre_do_shortcode_tag_p11() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_do_shortcode_tag_p11() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'p11';
</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">- public function _filter_pre_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_pre_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $arr = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => $return,
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => $key,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -871,17 +870,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_do_shortcode_tag_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Does nothing if no filters are set up.
</span><span class="cx" style="display: block; padding: 0 10px"> $str = 'do_shortcode_tag';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_shortcode( $str, array( $this, '_shortcode_do_shortcode_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_shortcode( $str, array( $this, 'shortcode_do_shortcode_tag' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_nofilter = do_shortcode( "[{$str}]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $result_nofilter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Modify output with filter.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_replace' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'do_shortcode_tag', array( $this, 'filter_do_shortcode_tag_replace' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_filter = do_shortcode( "[{$str}]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'fee', $result_filter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Respect priority.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_generate' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'do_shortcode_tag', array( $this, 'filter_do_shortcode_tag_generate' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_priority = do_shortcode( "[{$str}]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foobar', $result_priority );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,29 +902,29 @@
</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">- add_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_attr' ), 12, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'do_shortcode_tag', array( $this, 'filter_do_shortcode_tag_attr' ), 12, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result_atts = do_shortcode( "[{$str} a='b' c='d']" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_json_encode( $arr ), $result_atts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_attr' ), 12 );
- remove_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_generate' ), 11 );
- remove_filter( 'do_shortcode_tag', array( $this, '_filter_do_shortcode_tag_replace' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'do_shortcode_tag', array( $this, 'filter_do_shortcode_tag_attr' ), 12 );
+ remove_filter( 'do_shortcode_tag', array( $this, 'filter_do_shortcode_tag_generate' ), 11 );
+ remove_filter( 'do_shortcode_tag', array( $this, 'filter_do_shortcode_tag_replace' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_shortcode( $str );
</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">- public function _shortcode_do_shortcode_tag( $atts = array(), $content = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function shortcode_do_shortcode_tag( $atts = array(), $content = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">- public function _filter_do_shortcode_tag_replace( $return ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_do_shortcode_tag_replace( $return ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return str_replace( 'oo', 'ee', $return );
</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">- public function _filter_do_shortcode_tag_generate( $return ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_do_shortcode_tag_generate( $return ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'foobar';
</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">- public function _filter_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $arr = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => $return,
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => $key,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -940,7 +939,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Test 'value' syntax for empty 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">- function test_empty_single_quote_attribute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_single_quote_attribute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( '[test-shortcode-tag a="foo" b=\'bar\' c=baz foo \'bar\' "baz" ]test empty atts[/test-shortcode-tag]' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -958,7 +957,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37304
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_positional_atts_single_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_atts_single_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( "[test-shortcode-tag 'something in quotes' 'something else']" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,7 +973,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37304
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_positional_atts_mixed_quotes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_positional_atts_mixed_quotes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = do_shortcode( "[test-shortcode-tag 'something in quotes' \"something else\" 123 foo bar='baz' example=\"test\" ]" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $out );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span></span></pre></div>
<a id="trunktestsphpunittestssitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/site-health.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/site-health.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 47223
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_cron_health_checks_critical() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cron_health_checks_critical() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_site_health = new WP_Site_Health();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear the cron array.
</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"> * @dataProvider data_cron_health_checks
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47223
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_cron_health_checks( $times, $expected_status, $expected_label, $expected_late, $expected_missed ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cron_health_checks( $times, $expected_status, $expected_label, $expected_late, $expected_missed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_site_health = new WP_Site_Health();
</span><span class="cx" style="display: block; padding: 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"> * 4. bool Expected outcome has_late_cron()
</span><span class="cx" style="display: block; padding: 0 10px"> * 5. bool Expected outcome has_missed_cron()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_cron_health_checks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_cron_health_checks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '+5 minutes',
</span></span></pre></div>
<a id="trunktestsphpunittestssitemapsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/sitemaps/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/sitemaps/functions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/sitemaps/functions.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string|false $4 Sitemap 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">- function plain_permalinks_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function plain_permalinks_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'posts', 'post', 1, home_url( '/?sitemap=posts&sitemap-subtype=post&paged=1' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'posts', 'post', 0, home_url( '/?sitemap=posts&sitemap-subtype=post&paged=1' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string|false $4 Sitemap 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">- function pretty_permalinks_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function pretty_permalinks_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'posts', 'post', 1, home_url( '/wp-sitemap-posts-post-1.xml' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'posts', 'post', 0, home_url( '/wp-sitemap-posts-post-1.xml' ) ),
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/taxonomy.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,11 +4,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Taxonomy extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_post_taxonomies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_taxonomies() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'category', 'post_tag', 'post_format' ), get_object_taxonomies( 'post' ) );
</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">- function test_get_link_taxonomies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_link_taxonomies() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'link_category' ), get_object_taxonomies( 'link' ) );
</span><span class="cx" style="display: block; padding: 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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5417
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_unknown_taxonomies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_unknown_taxonomies() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Taxonomies for an unknown object type.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_object_taxonomies( rand_str() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_object_taxonomies( '' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_object_taxonomies( null ) );
</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">- function test_get_post_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_post_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_object_taxonomies( 'post' ) as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> // Should return an object with the correct taxonomy object type.
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_taxonomies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_taxonomies() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $taxes = get_the_taxonomies( $post_id );
</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"> $this->assertSame( 'Categories: <span class="foo"><a href="' . $link . '">Uncategorized</a></span>.', $taxes['category'] );
</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">- function test_the_taxonomies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_taxonomies() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString(
</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"> * @ticket 27238
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_taxonomies_term_template() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_taxonomies_term_template() {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo(
</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"> $this->assertSame( 'Categories: <span class="foo"><a href="' . $link . '">Uncategorized</a></span>.', $output );
</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">- function test_get_link_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_link_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_object_taxonomies( 'link' ) as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> // Should return an object with the correct taxonomy object type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,13 +115,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_taxonomy_exists_known() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_taxonomy_exists_known() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( taxonomy_exists( 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( taxonomy_exists( 'post_tag' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( taxonomy_exists( 'link_category' ) );
</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">- function test_taxonomy_exists_unknown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_taxonomy_exists_unknown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( taxonomy_exists( rand_str() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( taxonomy_exists( '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( taxonomy_exists( 0 ) );
</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"> $this->assertFalse( taxonomy_exists( null ) );
</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">- function test_is_taxonomy_hierarchical() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_taxonomy_hierarchical() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_taxonomy_hierarchical( 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_taxonomy_hierarchical( 'post_tag' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_taxonomy_hierarchical( 'link_category' ) );
</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">- function test_is_taxonomy_hierarchical_unknown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_taxonomy_hierarchical_unknown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_taxonomy_hierarchical( rand_str() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_taxonomy_hierarchical( '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_taxonomy_hierarchical( 0 ) );
</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"> $this->assertFalse( is_taxonomy_hierarchical( null ) );
</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">- function test_register_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make up a new taxonomy name, and ensure it's unused.
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = rand_str();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_taxonomies'][ $tax ] );
</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">- function test_register_hierarchical_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_hierarchical_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make up a new taxonomy name, and ensure it's unused.
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = rand_str();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48558
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_taxonomy_return_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_taxonomy_return_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Taxonomy', register_taxonomy( 'foo', 'post' ) );
</span><span class="cx" style="display: block; padding: 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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage register_taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_taxonomy_with_too_long_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_taxonomy_with_too_long_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', register_taxonomy( 'abcdefghijklmnopqrstuvwxyz0123456789', 'post', array() ) );
</span><span class="cx" style="display: block; padding: 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"> * @expectedIncorrectUsage register_taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_taxonomy_with_empty_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_taxonomy_with_empty_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', register_taxonomy( '', 'post', array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11058
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_registering_taxonomies_to_object_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_registering_taxonomies_to_object_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a taxonomy to test with.
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = 'test_tax';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( taxonomy_exists( $tax ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25706
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_in_category() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_in_category() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // in_category() returns false when first parameter is empty().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,7 +414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( in_category( $term['term_id'], $post ) );
</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">- function test_insert_category_create() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_category_create() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsNumeric( wp_insert_category( $cat, 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">- function test_insert_category_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_category_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</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"> $this->assertSame( 1, wp_insert_category( $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">- function test_insert_category_force_error_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_category_force_error_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'force_error',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +441,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', wp_insert_category( $cat, 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">- function test_insert_category_force_error_no_handle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_insert_category_force_error_no_handle() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'force_error',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -971,7 +971,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43517
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_term_for_custom_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_term_for_custom_taxonomy() {
</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::factory()->user->create( array( 'role' => 'editor' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1036,7 +1036,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51320
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_term_for_post_in_multiple_taxonomies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_term_for_post_in_multiple_taxonomies() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'test_post_type';
</span><span class="cx" style="display: block; padding: 0 10px"> $tax1 = 'test_tax1';
</span><span class="cx" style="display: block; padding: 0 10px"> $tax2 = 'test_tax2';
</span></span></pre></div>
<a id="trunktestsphpunitteststermcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/cache.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/cache.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_Cache extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'terms' );
</span><span class="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"> * @ticket 25711
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_category_children_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category_children_cache() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test with only one Parent => Child.
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1 = self::factory()->category->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1_child = self::factory()->category->create( array( 'parent' => $term_id1 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22526
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_category_name_change() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_category_name_change() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = self::factory()->category->create_and_get( array( 'name' => 'Foo' ) );
</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"> wp_set_post_categories( $post_id, $term->term_id );
</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"> * @ticket 14485
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hierachy_invalidation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hierachy_invalidation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax = 'burrito';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( get_taxonomy( $tax )->hierarchical );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21760
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_slug_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_slug_cache() {
</ins><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"> $term_id = $this->factory->term->create(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21760
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_slug_cache_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_slug_cache_update() {
</ins><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"> $term_id = $this->factory->term->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21760
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_name_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_name_cache() {
</ins><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"> $term_id = $this->factory->term->create(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21760
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_name_cache_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_name_cache_update() {
</ins><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"> $term_id = $this->factory->term->create(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21760
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalidating_term_caches_should_fail_when_invalidation_is_suspended() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalidating_term_caches_should_fail_when_invalidation_is_suspended() {
</ins><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"> $term_id = $this->factory->term->create(
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermByphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTermBy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermBy.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/getTermBy.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,19 +5,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_GetTermBy extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'slug', 'foo', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
</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">- function test_get_term_by_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'name', 'Foo', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
</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">- function test_get_term_by_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'id', $term1['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * 'term_id' is an alias of '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">- function test_get_term_by_term_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_term_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'term_id', $term1['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
</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"> * @ticket 45163
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_uppercase_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_uppercase_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'ID', $term1['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,13 +44,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21651
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_tt_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_tt_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'term_taxonomy_id', $term1['term_taxonomy_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
</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">- function test_get_term_by_unknown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_unknown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'Foo', 'category', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = get_term_by( 'unknown', 'foo', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $term2 );
</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"> * @ticket 33281
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_by_with_nonexistent_id_should_return_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_by_with_nonexistent_id_should_return_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'id', 123456, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $term );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermFieldphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTermField.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermField.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/getTermField.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public $taxonomy = 'wptests_tax';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $this->taxonomy, 'post' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_getTerms extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _clean_term_filters();
</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"> * @ticket 23506
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_should_allow_arbitrary_indexed_taxonomies_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_should_allow_arbitrary_indexed_taxonomies_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( array( '111' => 'post_tag' ), array( 'hide_empty' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $term_id, reset( $terms )->term_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13661
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id1 = self::factory()->tag->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'woo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11823
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_include_exclude() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_include_exclude() {
</ins><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"> $term_id1 = self::factory()->tag->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25710
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_exclude_tree() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_exclude_tree() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id_uncategorized = get_option( 'default_category' );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_search() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_search() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id1 = self::factory()->tag->create( array( 'slug' => 'burrito' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id2 = self::factory()->tag->create( array( 'name' => 'Wilbur' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id3 = self::factory()->tag->create( array( 'name' => 'Foo' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8214
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_like() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_like() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id1 = self::factory()->tag->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'burrito',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26903
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_parent_zero() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_parent_zero() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax = 'food';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</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"> * @ticket 26903
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_grandparent_zero() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_grandparent_zero() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax = 'food';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,7 +669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26903
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_seven_levels_deep() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_seven_levels_deep() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax = 'deep';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27123
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_child_of() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_child_of() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent = self::factory()->category->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $child = self::factory()->category->create( array( 'parent' => $parent ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @ticket 46768
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_child_of_fields_id_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_child_of_fields_id_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent = self::factory()->category->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $child = self::factory()->category->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,7 +761,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46768
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_terms_child_of_fields_id_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_terms_child_of_fields_id_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent = self::factory()->category->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $child = self::factory()->category->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -851,7 +851,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27123
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_term_children_recursion() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_term_children_recursion() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Assume there is a way to insert a term with the parent pointing to itself.
</span><span class="cx" style="display: block; padding: 0 10px"> // See: https://core.trac.wordpress.org/changeset/15806
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTheTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTheTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTheTerms.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/getTheTerms.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 22560
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_object_term_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_object_term_cache() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1 = array( 'foo', 'bar', 'baz' );
</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"> * @ticket 24189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_object_term_cache_when_term_changes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_object_term_cache_when_term_changes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_id = self::factory()->tag->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> * @ticket 34723
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_terms_should_return_wp_error_when_taxonomy_is_unregistered() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_terms_should_return_wp_error_when_taxonomy_is_unregistered() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_the_terms( $p, 'this-taxonomy-does-not-exist' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $terms );
</span></span></pre></div>
<a id="trunktestsphpunitteststermslashesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/slashes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$author_id = $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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_insert_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_tag',
</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"> * Tests the model function that expects slashed 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">- function test_wp_update_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_tag',
</span></span></pre></div>
<a id="trunktestsphpunitteststermtermCountsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/termCounts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/termCounts.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/termCounts.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @type int $change Expected change.
</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">- function data_term_count_changes_for_post_statuses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_count_changes_for_post_statuses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish', 1 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $change Expected change upon publish.
</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">- function data_term_counts_incremented_on_publish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_counts_incremented_on_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish', 0 ),
</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"> * @param string $new_post_status Post status after update.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $change Expected change upon publish.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_term_count_transitions_update_term_counts( $original_post_status, $new_post_status, $change ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_count_transitions_update_term_counts( $original_post_status, $new_post_status, $change ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[ $original_post_status ];
</span><span class="cx" style="display: block; padding: 0 10px"> $term_count = get_term( get_option( 'default_category' ) )->count;
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @type int $change Expected change upon publish.
</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">- function data_term_count_transitions_update_term_counts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_count_transitions_update_term_counts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Draft -> published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'draft', 'publish', 1 ),
</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"> );
</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">- function add_custom_status_to_counted_statuses( $statuses ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_custom_status_to_counted_statuses( $statuses ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> array_push( $statuses, 'custom' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $statuses;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @type int $change Expected change.
</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">- function data_term_count_changes_for_update_post_term_count_statuses_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_count_changes_for_update_post_term_count_statuses_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish', 2 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $change Expected change.
</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">- function data_term_count_changes_for_post_statuses_with_attachments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_count_changes_for_post_statuses_with_attachments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish', 2 ),
</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"> * @type int $change Expected change upon publish.
</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">- function data_term_counts_incremented_on_publish_with_attachments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_counts_incremented_on_publish_with_attachments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish', 0 ),
</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"> * @param string $new_post_status Post status after update.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $change Expected change upon publish.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_term_count_transitions_update_term_counts_with_attachments( $original_post_status, $new_post_status, $change ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_count_transitions_update_term_counts_with_attachments( $original_post_status, $new_post_status, $change ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[ $original_post_status ];
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_object_terms( $post_id, self::$attachment_term, 'wp_test_tax_counts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</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"> * @type int $change Expected change upon publish.
</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">- function data_term_count_transitions_update_term_counts_with_attachments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_count_transitions_update_term_counts_with_attachments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Draft -> published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'draft', 'publish', 2 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +494,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $change Expected change upon publish.
</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">- function data_term_counts_incremented_on_publish_with_untermed_attachments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_counts_incremented_on_publish_with_untermed_attachments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'publish', 0 ),
</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"> * @param string $new_post_status Post status after update.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $change Expected change upon publish.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_term_count_transitions_update_term_counts_with_untermed_attachments( $original_post_status, $new_post_status, $change ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_count_transitions_update_term_counts_with_untermed_attachments( $original_post_status, $new_post_status, $change ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[ $original_post_status ];
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_object_terms( $post_id, self::$attachment_term, 'wp_test_tax_counts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</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"> * @type int $change Expected change upon publish.
</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">- function data_term_count_transitions_update_term_counts_with_untermed_attachments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_term_count_transitions_update_term_counts_with_untermed_attachments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0. Draft -> published post
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'draft', 'publish', 1 ),
</span></span></pre></div>
<a id="trunktestsphpunitteststermtermExistsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/termExists.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/termExists.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/termExists.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> $this->assertEquals( $t, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_term_exists_known() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_exists_known() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert a term.
</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"> _unregister_taxonomy( 'wptests_tax' );
</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">- function test_term_exists_unknown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_exists_unknown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( term_exists( rand_str() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, term_exists( 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( term_exists( '' ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpGenerateTagCloudphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @param $expected Expected output from `wp_generate_tag_cloud()`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $args Options for `wp_generate_tag_cloud()`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_tags_list_returned( $expected, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_tags_list_returned( $expected, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_ids = self::factory()->term->create_many( 4, array( 'taxonomy' => 'post_tag' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_ids as $term_id ) {
</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"> * @return 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">- function empty_tags_data_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function empty_tags_data_provider() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // When 'format' => 'array', we should be getting an empty array back.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> );
</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">- function test_hide_empty_false() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hide_empty_false() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '>' . $tags[0]->name . '<', $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hide_empty_false_format_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hide_empty_false_format_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id, 'post_tag' );
</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"> $this->assertStringContainsString( '>' . $tags[0]->name . '<', $found[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hide_empty_false_format_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hide_empty_false_format_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id, 'post_tag' );
</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"> $this->assertStringContainsString( '>' . $tags[0]->name . '<', $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_hide_empty_false_multi() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hide_empty_false_multi() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_ids = self::factory()->tag->create_many( 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_ids as $term_id ) {
</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"> }
</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">- function test_hide_empty_false_multi_format_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_hide_empty_false_multi_format_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_ids = self::factory()->tag->create_many( 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_ids as $term_id ) {
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpGetObjectTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -953,7 +953,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( implode( ',', $terms ), $terms_to_edit );
</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">- function filter_wp_get_object_terms_args( $args, $object_ids, $taxonomies ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_wp_get_object_terms_args( $args, $object_ids, $taxonomies ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['orderby'] = 'term_order';
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpSetObjectTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 26570
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_object_terms() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_object_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $non_hier = rand_str( 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> $hier = rand_str( 10 );
</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"> $this->assertTrue( has_term( array( $cat1->slug, $cat2->slug, $cat3->slug ), $hier, $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">- function test_set_object_terms_by_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_object_terms_by_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ids = self::$post_ids;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</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><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">- function test_set_object_terms_by_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_object_terms_by_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ids = self::$post_ids;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_object_terms_invalid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_object_terms_invalid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bogus taxonomy.
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_set_object_terms( self::$post_ids[0], array( rand_str() ), rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set some terms on an object; then change them while leaving one intact.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_change_object_terms_by_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_change_object_terms_by_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First set: 3 terms.
</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"> * Set some terms on an object; then change them while leaving one intact.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_change_object_terms_by_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_change_object_terms_by_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1 = array( 'foo', 'bar', 'baz' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpUpdateTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpUpdateTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29614
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_term_parent_does_not_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_term_parent_does_not_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/term.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 5381
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_term_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_term_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Insert a term.
</span><span class="cx" style="display: block; padding: 0 10px"> $term = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $t = wp_insert_term( $term, $this->taxonomy );
</span><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"> * @ticket 15919
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_count_terms() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = wp_count_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</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"> * @ticket 36399
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_count_terms_legacy_interoperability() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_count_terms_legacy_interoperability() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->tag->create_many( 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Counts all terms (1 default category, 5 tags).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15475
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_add_remove_object_terms() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_add_remove_object_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = self::$post_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = self::factory()->tag->create_many( 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group category.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">- function test_term_is_ancestor_of() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_is_ancestor_of() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_term( $t2['term_id'], 'category' );
</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">- function test_wp_insert_delete_category() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_delete_category() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( category_exists( $term ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16550
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_set_post_categories() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_set_post_categories() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43516
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_set_post_categories_sets_default_category_for_custom_post_types() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_set_post_categories_sets_default_category_for_custom_post_types() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_category_post_types', array( $this, 'filter_default_category_post_types' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'cpt', array( 'taxonomies' => array( 'category' ) ) );
</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"> remove_filter( 'default_category_post_types', array( $this, 'filter_default_category_post_types' ) );
</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">- function filter_default_category_post_types( $post_types ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_default_category_post_types( $post_types ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_types[] = 'cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> return $post_types;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25852
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_term_field() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_term_field() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = wp_insert_term( 'foo', $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, sanitize_term_field( 'parent', 0, $term['term_id'], $this->taxonomy, 'raw' ) );
</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"> * @ticket 19205
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_orphan_category() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_orphan_category() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_id1 = self::factory()->category->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_category( $cat_id1 );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemecustomHeaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/customHeader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/customHeader.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/theme/customHeader.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$header_video_id = $factory->attachment->create_upload_object( $file );
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</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"> wp_dequeue_script( 'wp-custom-header' );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->customize_manager = null;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_customize'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,23 +42,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_add_and_remove_theme_support() {
- $this->_add_theme_support();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_and_remove_theme_support() {
+ $this->add_theme_support();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'custom-header' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'custom-header' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'custom-header' ) );
</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">- function test_get_header_image_without_registered_default() {
- $this->_add_theme_support();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_without_registered_default() {
+ $this->add_theme_support();
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = get_header_image();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_header_image() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $image );
</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">- function test_get_header_image_with_registered_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_with_registered_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = 'http://localhost/default-header.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'default-image' => $default ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'default-image' => $default ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image = get_header_image();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_header_image() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,10 +65,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $default, $image );
</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">- function test_get_header_image_from_theme_mod() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_from_theme_mod() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = 'http://localhost/default-header.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $custom = 'http://localhost/custom-header.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'default-image' => $default ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'default-image' => $default ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_image', $custom );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = get_header_image();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,15 +81,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $image );
</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">- function test_get_header_image_tag_without_registered_default_image() {
- $this->_add_theme_support();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_tag_without_registered_default_image() {
+ $this->add_theme_support();
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = get_header_image_tag();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $html );
</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">- function test_get_header_image_tag_with_registered_default_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_tag_with_registered_default_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = 'http://localhost/default-header.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'default-image' => $default ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'default-image' => $default ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = get_header_image_tag();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( '<img ', $html );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,9 +99,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38633
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_header_image_tag_with_registered_default_image_and_remove_header_theme_mod() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_tag_with_registered_default_image_and_remove_header_theme_mod() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = 'http://localhost/default-header.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'default-image' => $default ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'default-image' => $default ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_image', 'remove-header' );
</span><span class="cx" style="display: block; padding: 0 10px"> $html = get_header_image_tag();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,10 +108,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $html );
</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">- function test_get_header_image_tag_with_registered_default_image_and_custom_theme_mod() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_image_tag_with_registered_default_image_and_custom_theme_mod() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = 'http://localhost/default-header.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $custom = 'http://localhost/custom-header.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'default-image' => $default ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'default-image' => $default ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_image', $custom );
</span><span class="cx" style="display: block; padding: 0 10px"> $html = get_header_image_tag();
</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"> $this->assertStringContainsString( sprintf( 'src="%s"', $custom ), $html );
</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">- function test_get_custom_header_markup_without_registered_default_image() {
- $this->_add_theme_support();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_header_markup_without_registered_default_image() {
+ $this->add_theme_support();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = get_custom_header_markup();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_custom_header() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,14 +127,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $html );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The container should always be returned in the Customizer preview.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_set_customize_previewing( true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_customize_previewing( true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = get_custom_header_markup();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '<div id="wp-custom-header" class="wp-custom-header"></div>', $html );
</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">- function test_get_custom_header_markup_with_registered_default_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_header_markup_with_registered_default_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = 'http://localhost/default-header.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'default-image' => $default ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'default-image' => $default ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = get_custom_header_markup();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_custom_header() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( '<div id="wp-custom-header" class="wp-custom-header">', $html );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,8 +141,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( sprintf( 'src="%s"', $default ), $html );
</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">- function test_get_header_video_url() {
- $this->_add_theme_support( array( 'video' => true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_video_url() {
+ $this->add_theme_support( array( 'video' => true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_header_video() );
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_video', self::$header_video_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,9 +150,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_get_attachment_url( self::$header_video_id ), get_header_video_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">- function test_get_external_header_video_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_external_header_video_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $external = 'http://example.com/custom-video.mp4';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'video' => true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'video' => true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_header_video() );
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'external_header_video', $external );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,9 +160,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $external, get_header_video_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">- function test_get_header_video_url_prefers_local_video() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_header_video_url_prefers_local_video() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $external = 'http://example.com/custom-video.mp4';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support( array( 'video' => true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support( array( 'video' => true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_video', self::$header_video_id );
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'external_header_video', $external );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,9 +169,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_get_attachment_url( self::$header_video_id ), get_header_video_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">- function test_get_custom_header_markup_with_video_and_without_an_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_custom_header_markup_with_video_and_without_an_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $custom = 'http://localhost/custom-video.mp4';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_true',
</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"> $this->assertSame( '<div id="wp-custom-header" class="wp-custom-header"></div>', $html );
</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">- function test_header_script_is_not_enqueued_by_the_custom_header_markup_without_video() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_script_is_not_enqueued_by_the_custom_header_markup_without_video() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,8 +206,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_script_is( 'wp-custom-header', 'enqueued' ) );
</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">- function test_header_script_is_not_enqueued_by_the_custom_header_markup_when_active_callback_is_false() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_script_is_not_enqueued_by_the_custom_header_markup_when_active_callback_is_false() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,14 +221,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_script_is( 'wp-custom-header', 'enqueued' ) );
</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">- function test_header_script_is_enqueued_by_the_custom_header_markup_without_video_when_previewing_in_customizer() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_script_is_enqueued_by_the_custom_header_markup_without_video_when_previewing_in_customizer() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_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->_set_customize_previewing( true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_customize_previewing( true );
</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"> the_custom_header_markup();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,8 +236,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_script_is( 'wp-custom-header', 'enqueued' ) );
</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">- function test_header_script_is_enqueued_by_the_custom_header_markup_with_video() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_header_script_is_enqueued_by_the_custom_header_markup_with_video() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,8 +254,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_video_header_callback_front_page_from_front_page() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_video_header_callback_front_page_from_front_page() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,8 +271,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_video_header_callback_front_page_from_elsewhere() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_video_header_callback_front_page_from_elsewhere() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,8 +288,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_video_header_callback_globally_from_front_page() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_video_header_callback_globally_from_front_page() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,8 +306,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_video_header_callback_globally_from_elsewhere() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_video_header_callback_globally_from_elsewhere() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,8 +324,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_video_header_callback_globally_with_negative_filter() {
- $this->_add_theme_support(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_video_header_callback_globally_with_negative_filter() {
+ $this->add_theme_support(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'video-active-callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * add_theme_support( 'custom-header' ) will poison subsequent tests since
</span><span class="cx" style="display: block; padding: 0 10px"> * it defines constants.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _add_theme_support( $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function add_theme_support( $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_theme_features['custom-header'][0] = wp_parse_args(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _set_customize_previewing( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function set_customize_previewing( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = new ReflectionClass( 'WP_Customize_Manager' );
</span><span class="cx" style="display: block; padding: 0 10px"> $property = $class->getProperty( 'previewing' );
</span><span class="cx" style="display: block; padding: 0 10px"> $property->setAccessible( true );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemegetThemeStarterContentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/getThemeStarterContent.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/getThemeStarterContent.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/theme/getThemeStarterContent.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Testing passing an empty array as starter 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">- function test_add_theme_support_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_theme_support_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'starter-content', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $starter_content = get_theme_starter_content();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Testing passing nothing as starter 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">- function test_add_theme_support_single_param() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_theme_support_single_param() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'starter-content' );
</span><span class="cx" style="display: block; padding: 0 10px"> $starter_content = get_theme_starter_content();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Testing that placeholder starter content gets expanded, that unrecognized placeholders are discarded, and that custom items are recognized.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_content_sections() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_content_sections() {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * All placeholder identifiers should be referenced in this sample starter
</span><span class="cx" style="display: block; padding: 0 10px"> * content and then tested to ensure they get hydrated in the call to
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Testing the filter with the text_credits widget.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_theme_starter_content_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_theme_starter_content_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><span class="cx" style="display: block; padding: 0 10px"> 'starter-content',
</span></span></pre></div>
<a id="trunktestsphpunitteststhemesupportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/support.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/support.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/theme/support.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_Theme_Support extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_basics() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_basics() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'automatic-feed-links' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'automatic-feed-links' );
</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"> $this->assertTrue( current_theme_supports( 'automatic-feed-links' ) );
</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">- function test_admin_bar() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_admin_bar() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'admin-bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'admin-bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'admin-bar' );
</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"> * @ticket 24932
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_supports_html5() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_supports_html5() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'html5' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage add_theme_support( 'html5' )
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_supports_html5_subset() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_supports_html5_subset() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'html5' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
</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"> * @expectedIncorrectUsage add_theme_support( 'html5' )
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_supports_html5_invalid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_supports_html5_invalid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'html5' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_theme_support( 'html5', 'comment-form' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,12 +137,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage add_theme_support( 'post-formats' )
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_supports_post_formats_doing_it_wrong() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_supports_post_formats_doing_it_wrong() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The second parameter should be an array.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_theme_support( 'post-formats' ) );
</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">- function supports_foobar( $yesno, $args, $feature ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function supports_foobar( $yesno, $args, $feature ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args[0] === $feature[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_plugin_hook() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_plugin_hook() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'foobar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'foobar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'foobar' ) );
</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"> * @ticket 26900
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_supports_menus() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_supports_menus() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start fresh.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_registered_nav_menus() as $location => $desc ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unregister_nav_menu( $location );
</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"> * @ticket 45125
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_responsive_embeds() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_responsive_embeds() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'responsive-embeds' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'responsive-embeds' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'responsive-embeds' );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemethemeDirphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/themeDir.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/themeDir.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/theme/themeDir.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Theme_ThemeDir extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_root = DIR_TESTDATA . '/themedir1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,15 +16,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'theme_root', array( $this, '_theme_root' ) );
- add_filter( 'stylesheet_root', array( $this, '_theme_root' ) );
- add_filter( 'template_root', array( $this, '_theme_root' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
+ add_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
+ add_filter( 'template_root', array( $this, 'filter_theme_root' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Clear caches.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace the normal theme root directory with our premade test directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _theme_root( $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_theme_root( $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->theme_root;
</span><span class="cx" style="display: block; padding: 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"> * @expectedDeprecated get_theme
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = get_theme( 'WordPress Default' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $themes['WordPress Default'], $theme );
</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"> * @expectedDeprecated get_theme
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_sandbox() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_sandbox() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = get_theme( 'Sandbox' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_stylesheet_only() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_stylesheet_only() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = $themes['Stylesheet Only'];
</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"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ignore themes in the default /themes directory.
</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"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_broken_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_broken_themes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_broken_themes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</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"> $this->assertSame( $expected, get_broken_themes() );
</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">- function test_wp_get_theme_with_non_default_theme_root() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_theme_with_non_default_theme_root() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_theme( 'sandbox', $this->theme_root )->errors() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_theme( 'sandbox' )->errors() );
</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"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_templates() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_templates() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = $themes['Page Template Theme'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_theme_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">- function test_get_theme_data_top_level() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_theme_data_top_level() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_data = get_theme_data( DIR_TESTDATA . '/themedir1/theme1/style.css' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'My Theme', $theme_data['Name'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_theme_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">- function test_get_theme_data_subdir() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_theme_data_subdir() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_data = get_theme_data( $this->theme_root . '/subdir/theme2/style.css' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'My Subdir Theme', $theme_data['Name'] );
</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"> * @ticket 28662
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_dir_slashes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_dir_slashes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $size = count( $GLOBALS['wp_theme_directories'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @mkdir( WP_CONTENT_DIR . '/themes/foo' );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/theme.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> 'twentytwentyone',
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_theme_directories;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,17 +30,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $backup_wp_theme_directories = $wp_theme_directories;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_theme_directories = array( WP_CONTENT_DIR . '/themes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'extra_theme_headers', array( $this, '_theme_data_extra_headers' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'extra_theme_headers', array( $this, 'theme_data_extra_headers' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_theme_directories;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_theme_directories = $this->wp_theme_directories;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'extra_theme_headers', array( $this, '_theme_data_extra_headers' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'extra_theme_headers', array( $this, 'theme_data_extra_headers' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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"> parent::tear_down();
</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">- function test_wp_get_themes_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_themes_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = wp_get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Theme', $themes[ $this->theme_slug ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->theme_name, $themes[ $this->theme_slug ]->get( 'Name' ) );
</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"> * @expectedDeprecated get_theme
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_themes_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_themes_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Theme', $themes[ $this->theme_name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $themes[ $this->theme_name ], get_theme( $this->theme_name ) );
</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"> * @expectedDeprecated get_theme
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $themes ) as $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = get_theme( $name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = wp_get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Theme', $theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_themes_contents() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_themes_contents() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> // Generic tests that should hold true for any theme.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $k => $theme ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_get_theme_contents() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_theme_contents() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( $this->theme_slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->theme_name, $theme->get( 'Name' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29925
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_theme_in_default_theme_list() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_theme_in_default_theme_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $latest_default_theme = WP_Theme::get_core_default_theme();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $latest_default_theme->exists() || 'twenty' !== substr( $latest_default_theme->get_stylesheet(), 0, 6 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'No Twenty* series default themes are installed.' );
</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"> $this->assertContains( $latest_default_theme->get_stylesheet(), $this->default_themes );
</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">- function test_default_themes_have_textdomain() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_themes_have_textdomain() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->default_themes as $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_get_theme( $theme )->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $theme, wp_get_theme( $theme )->get( 'TextDomain' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48566
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_year_in_readme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_year_in_readme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This test is designed to only run on trunk/master.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipOnAutomatedBranches();
</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"> * @ticket 20897
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_theme_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">- function test_extra_theme_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_extra_theme_headers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_theme = wp_get_theme( $this->theme_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $wp_theme->get( 'License' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $path_to_style_css = $wp_theme->get_theme_root() . '/' . $wp_theme->get_stylesheet() . '/style.css';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $theme_data['License'], $wp_theme->get( 'License' ) );
</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">- function _theme_data_extra_headers() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function theme_data_extra_headers() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'License' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @expectedDeprecated get_themes
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated get_current_theme
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_switch_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switch_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = get_themes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Switch to each theme in sequence.
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_switch_theme_bogus() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switch_theme_bogus() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Try switching to a theme that doesn't exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $template = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $style = rand_str();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_wp_keep_alive_customize_changeset_dependent_auto_drafts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_keep_alive_customize_changeset_dependent_auto_drafts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_keep_alive_customize_changeset_dependent_auto_drafts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_created_post_ids = $this->factory()->post->create_many(
</span><span class="cx" style="display: block; padding: 0 10px"> 2,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +621,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 49406
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _dp_register_theme_support_validation
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_register_theme_support_validation
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $error_code The error code expected.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args The args to register.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $error_code, $registered->get_error_code() );
</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">- public function _dp_register_theme_support_validation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_register_theme_support_validation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'invalid_type',
</span></span></pre></div>
<a id="trunktestsphpunittestsuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/upload.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/upload.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public $siteurl;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_reset_options();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_options();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _reset_options() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function reset_options() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // System defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', 'wp-content/uploads' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_url_path', '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'uploads_use_yearmonth_folders', 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">- function test_upload_dir_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_dir_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // wp_upload_dir() with default parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> $info = wp_upload_dir();
</span><span class="cx" style="display: block; padding: 0 10px"> $subdir = date_format( date_create( 'now' ), '/Y/m' );
</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"> $this->assertFalse( $info['error'] );
</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">- function test_upload_dir_relative() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_dir_relative() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // wp_upload_dir() with a relative upload path that is not 'wp-content/uploads'.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', 'foo/bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $info = _wp_upload_dir();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5953
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_upload_dir_absolute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_dir_absolute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = get_temp_dir() . 'wp-unit-test';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // wp_upload_dir() with an absolute upload path.
</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"> $this->assertFalse( $info['error'] );
</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">- function test_upload_dir_no_yearnum() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_dir_no_yearnum() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'uploads_use_yearmonth_folders', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
</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"> $this->assertFalse( $info['error'] );
</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">- function test_upload_path_absolute() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_path_absolute() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_url_path', 'http://' . WP_TESTS_DOMAIN . '/asdf' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $info['error'] );
</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">- function test_upload_dir_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_upload_dir_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Upload path setting is empty - it should default to 'wp-content/uploads'.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsurlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/url.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/url.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/url.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_URL extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['pagenow'] = '';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_ssl
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_ssl( $value, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_ssl( $value, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = $value;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_ssl = is_ssl();
</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"> $this->assertSame( $expected, $is_ssl );
</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">- function data_is_ssl() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_is_ssl() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'on',
</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"> );
</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">- function test_is_ssl_by_port() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_ssl_by_port() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $_SERVER['HTTPS'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['SERVER_PORT'] = '443';
</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"> $this->assertTrue( $is_ssl );
</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">- function test_is_ssl_with_no_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_ssl_with_no_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $_SERVER['HTTPS'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_ssl = is_ssl();
</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"> * @param string $url Test URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected Expected 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">- function test_admin_url( $url, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_admin_url( $url, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $siteurl_http = get_option( 'siteurl' );
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_url_http = admin_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $siteurl_https . $expected, $admin_url_https );
</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">- function data_admin_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_admin_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> null,
</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"> * @param string $url Test URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected Expected 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">- function test_home_url( $url, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_home_url( $url, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $homeurl_http = get_option( 'home' );
</span><span class="cx" style="display: block; padding: 0 10px"> $home_url_http = home_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $homeurl_https . $expected, $home_url_https );
</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">- function data_home_urls() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_home_urls() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> null,
</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">- function test_home_url_from_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_home_url_from_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Pretend to be in the site admin.
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'dashboard' );
</span><span class="cx" style="display: block; padding: 0 10px"> $home = get_option( 'home' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', set_url_scheme( $home, 'http' ) );
</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">- function test_network_home_url_from_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_network_home_url_from_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Pretend to be in the site admin.
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'dashboard' );
</span><span class="cx" style="display: block; padding: 0 10px"> $home = network_home_url();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $home_https, network_home_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">- function test_set_url_scheme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_url_scheme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $links = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://wordpress.org/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://wordpress.org/',
</span></span></pre></div>
<a id="trunktestsphpunittestsuserauthorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/author.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/author.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,13 +33,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( get_post( 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">- function test_get_the_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_name = get_the_author();
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Test Author', $author_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_author_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_author_meta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test_author', get_the_author_meta( 'login' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test_author', get_the_author_meta( 'user_login' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Test Author', get_the_author_meta( 'display_name' ) );
</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"> $this->assertSame( '', get_the_author_meta( '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">- function test_get_the_author_meta_no_authordata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_author_meta_no_authordata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['authordata'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_the_author_meta( 'id' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_the_author_meta( 'user_login' ) );
</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"> $this->assertSame( '', get_the_author_meta( '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">- function test_get_the_author_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_author_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test with no global post, result should be 0 because no author is found.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, get_the_author_posts() );
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = self::$post_id;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30904
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_author_posts_with_custom_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_the_author_posts_with_custom_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_ids = self::factory()->post->create_many(
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,10 +53,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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> // Keep track of users we create.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> }
</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">- function _flush_roles() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function flush_roles() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // We want to make sure we're testing against the DB, not just in-memory data.
</span><span class="cx" style="display: block; padding: 0 10px"> // This will flush everything and reload it from the DB.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_user_roles'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,15 +73,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles = new WP_Roles();
</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">- function _meta_yes_you_can( $can, $key, $post_id, $user_id, $cap, $caps ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function meta_yes_you_can( $can, $key, $post_id, $user_id, $cap, $caps ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 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">- function _meta_no_you_cant( $can, $key, $post_id, $user_id, $cap, $caps ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function meta_no_you_cant( $can, $key, $post_id, $user_id, $cap, $caps ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _meta_filter( $meta_value, $meta_key, $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function meta_filter( $meta_value, $meta_key, $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $meta_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $role The role to test for.
</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">- function data_single_site_roles_to_check() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_single_site_roles_to_check() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'anonymous' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'administrator' ),
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the tests.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_single_and_multisite_cap_tests_match() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_and_multisite_cap_tests_match() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $single_primitive = array_keys( $this->_getSingleSitePrimitiveCaps() );
</span><span class="cx" style="display: block; padding: 0 10px"> $multi_primitive = array_keys( $this->_getMultiSitePrimitiveCaps() );
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $single_primitive );
</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"> * Test the tests.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_all_caps_of_users_are_being_tested() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_all_caps_of_users_are_being_tested() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getPrimitiveCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // `manage_links` is a special case.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider dataAllCapsAndRoles
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_default_caps_for_all_roles( $role, $cap ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_caps_for_all_roles( $role, $cap ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users[ $role ];
</span><span class="cx" style="display: block; padding: 0 10px"> $roles_by_cap = $this->getAllCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,7 +592,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_single_site_roles_to_check
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_other_caps_for_all_roles( $role ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_other_caps_for_all_roles( $role ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users[ $role ];
</span><span class="cx" style="display: block; padding: 0 10px"> $old_id = wp_get_current_user()->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_single_site_roles_to_check
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_exists_in_database( $role ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_exists_in_database( $role ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users[ $role ];
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -697,7 +697,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Special case for the link 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">- function test_link_manager_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_link_manager_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'manage_links' => array( 'administrator', 'editor' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Special case for unfiltered uploads.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unfiltered_upload_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unfiltered_upload_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( defined( 'ALLOW_UNFILTERED_UPLOADS' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No-one should have this cap.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +828,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_super_admin_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_super_admin_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getAllCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::$super_admin;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,7 +853,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A role that doesn't exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_bogus_role() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bogus_role() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get( array( 'role' => 'invalid_role' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the user is valid.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,7 +873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A user with multiple roles.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_subscriber_contributor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_subscriber_contributor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['subscriber'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the user is valid.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,13 +905,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Newly added empty role.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_empty_role() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_empty_role() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_roles;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'janitor';
</span><span class="cx" style="display: block; padding: 0 10px"> add_role( $role_name, 'Janitor', 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->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get( array( 'role' => $role_name ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,7 +931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_role( $role_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,7 +938,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Newly added role.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_role() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_role() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_roles;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'janitor';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,7 +950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'level_2' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> add_role( $role_name, 'Janitor', $expected_caps );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get( array( 'role' => $role_name ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +976,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_role( $role_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,11 +984,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Change the capabilites associated with a role and make sure the change
</span><span class="cx" style="display: block; padding: 0 10px"> * is reflected in has_cap().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_role_add_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_role_add_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_roles;
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'janitor';
</span><span class="cx" style="display: block; padding: 0 10px"> add_role( $role_name, 'Janitor', array( 'level_1' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Assign a user to that role.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,7 +996,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now add a cap to the role.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles->add_cap( $role_name, 'sweep_floor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "Problem getting user $id" );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_role( $role_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,7 +1026,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Change the capabilites associated with a role and make sure the change
</span><span class="cx" style="display: block; padding: 0 10px"> * is reflected in has_cap().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_role_remove_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_role_remove_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_roles;
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'janitor';
</span><span class="cx" style="display: block; padding: 0 10px"> add_role(
</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"> 'polish_doorknobs' => 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->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Assign a user to that role.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,7 +1046,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now remove a cap from the role.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles->remove_cap( $role_name, 'polish_doorknobs' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "Problem getting user $id" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,7 +1062,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_role( $role_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_flush_roles();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_roles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,7 +1070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add an extra capability to a user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_add_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_add_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // There are two contributors.
</span><span class="cx" style="display: block; padding: 0 10px"> $id_1 = self::$users['contributor']->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,7 +1109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add an extra capability to a user then remove 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">- function test_user_remove_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_remove_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // There are two contributors.
</span><span class="cx" style="display: block; padding: 0 10px"> $id_1 = self::$users['contributor']->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1141,7 +1141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Make sure the user_level is correctly set and changed with the user's role.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_level_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_level_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // User starts as an author.
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::$users['author']->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,7 +1164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 7, $user->user_level );
</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">- function test_user_remove_all_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_remove_all_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // User starts as an author.
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::$users['author']->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1205,7 +1205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Simple tests for some common meta capabilities.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_meta_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_meta_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get our author.
</span><span class="cx" style="display: block; padding: 0 10px"> $author = self::$users['author'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1280,7 +1280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $admin->has_cap( 'add_post_meta', $post, '_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $admin->has_cap( 'delete_post_meta', $post, '_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_meta( 'post', '_protected', array( $this, '_meta_filter' ), array( $this, '_meta_yes_you_can' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta( 'post', '_protected', array( $this, 'meta_filter' ), array( $this, 'meta_yes_you_can' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $admin->has_cap( 'edit_post_meta', $post, '_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $admin->has_cap( 'add_post_meta', $post, '_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $admin->has_cap( 'delete_post_meta', $post, '_protected' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1289,7 +1289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $admin->has_cap( 'add_post_meta', $post, 'not_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $admin->has_cap( 'delete_post_meta', $post, 'not_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_meta( 'post', 'not_protected', array( $this, '_meta_filter' ), array( $this, '_meta_no_you_cant' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta( 'post', 'not_protected', array( $this, 'meta_filter' ), array( $this, 'meta_no_you_cant' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $admin->has_cap( 'edit_post_meta', $post, 'not_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $admin->has_cap( 'add_post_meta', $post, 'not_protected' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $admin->has_cap( 'delete_post_meta', $post, 'not_protected' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1296,7 +1296,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">- function authorless_post_statuses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function authorless_post_statuses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( array( 'draft' ), array( 'private' ), array( 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1304,7 +1304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27020
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider authorless_post_statuses
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_authorless_post( $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_authorless_post( $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make a post without an author.
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1334,7 +1334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16714
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_create_posts_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_posts_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $author = self::$users['author'];
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = self::$users['editor'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1400,7 +1400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Simple tests for some common meta capabilities.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_page_meta_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_page_meta_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get our author.
</span><span class="cx" style="display: block; padding: 0 10px"> $author = self::$users['author'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1604,7 +1604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_negative_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_negative_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = self::$users['author'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author->add_cap( 'foo', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1619,7 +1619,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18932
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_role_same_role() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_role_same_role() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = $user->caps;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $user->caps );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1628,7 +1628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $caps, $user->caps );
</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">- function test_current_user_can_for_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_current_user_can_for_blog() {
</ins><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"> $user = self::$users['administrator'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1656,13 +1656,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_borked_current_user_can_for_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_borked_current_user_can_for_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orig_blog_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_nullify_current_user();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->nullify_current_user();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'switch_blog', array( $this, '_nullify_current_user_and_keep_nullifying_user' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'switch_blog', array( $this, 'nullify_current_user_and_keep_nullifying_user' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> current_user_can_for_blog( $blog_id, 'edit_posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1669,7 +1669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $orig_blog_id, get_current_blog_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">- function _nullify_current_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function nullify_current_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prevents fatal errors in ::tearDown()'s and other uses of restore_current_blog().
</span><span class="cx" style="display: block; padding: 0 10px"> $function_stack = wp_debug_backtrace_summary( null, 0, false );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'restore_current_blog', $function_stack, true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1678,14 +1678,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['current_user'] = null;
</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">- function _nullify_current_user_and_keep_nullifying_user() {
- add_action( 'set_current_user', array( $this, '_nullify_current_user' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function nullify_current_user_and_keep_nullifying_user() {
+ add_action( 'set_current_user', array( $this, 'nullify_current_user' ) );
</ins><span class="cx" style="display: block; padding: 0 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"> * @ticket 28374
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_current_user_edit_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_current_user_edit_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['contributor'];
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1702,7 +1702,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $user->has_cap( 'publish_posts' ) );
</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">- function test_subscriber_cant_edit_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_subscriber_cant_edit_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['subscriber'];
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1715,7 +1715,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multisite_administrator_can_not_edit_users() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multisite_administrator_can_not_edit_users() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $other_user = self::$users['subscriber'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1724,7 +1724,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can( 'edit_user', $other_user->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_can_edit_self() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_can_edit_self() {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( self::$users as $role => $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can( 'edit_user', $user->ID ), "User with role {$role} should have the capability to edit their own profile" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1785,7 +1785,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33694
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_contributor_cannot_edit_scheduled_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_contributor_cannot_edit_scheduled_post() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a contributor.
</span><span class="cx" style="display: block; padding: 0 10px"> $contributor = self::$users['contributor'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1819,7 +1819,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multisite_administrator_with_manage_network_users_can_edit_users() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multisite_administrator_with_manage_network_users_can_edit_users() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'manage_network_users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $other_user = self::$users['subscriber'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1836,7 +1836,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'manage_network_users' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1853,7 +1853,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16956
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage map_meta_cap
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_require_edit_others_posts_if_post_type_doesnt_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_require_edit_others_posts_if_post_type_doesnt_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'existed' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'existed' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( 'existed' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1876,7 +1876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48653
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage map_meta_cap
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_require_edit_others_posts_if_post_status_doesnt_exist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_require_edit_others_posts_if_post_status_doesnt_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'existed' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_status' => 'existed' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_status( 'existed' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1898,7 +1898,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17253
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_cpt_with_page_capability_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cpt_with_page_capability_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_capability',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1967,7 +1967,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35488
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_logout_should_clear_current_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_logout_should_clear_current_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::$users['author']->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2116,7 +2116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36961
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_init_user_caps_for_different_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_init_user_caps_for_different_site() {
</ins><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"> $site_id = self::factory()->blog->create( array( 'user_id' => self::$users['administrator']->ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2144,7 +2144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36961
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_init_user_caps_for_different_site_by_user_switch() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_init_user_caps_for_different_site_by_user_switch() {
</ins><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"> $user = new WP_User( self::$users['subscriber']->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2173,7 +2173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36961
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_caps_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_caps_data() {
</ins><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"> $custom_caps = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2191,7 +2191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36961
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_get_site_id_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_get_site_id_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$users['subscriber']->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_current_blog_id(), $user->get_site_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2199,7 +2199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36961
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_get_site_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_get_site_id() {
</ins><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"> // Suppressing errors here allows to get around creating an actual site,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2215,7 +2215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38645
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_init_roles_for_different_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_init_roles_for_different_site() {
</ins><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"> $site_id = self::factory()->blog->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2243,7 +2243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38645
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_roles_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_roles_data() {
</ins><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"> $custom_roles = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2266,7 +2266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38645
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_roles_get_site_id_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_roles_get_site_id_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $roles = new WP_Roles();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_current_blog_id(), $roles->get_site_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2274,7 +2274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38645
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_roles_get_site_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_roles_get_site_id() {
</ins><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"> // Suppressing errors here allows to get around creating an actual site,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2289,7 +2289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_block_caps
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_block_caps( $role, $cap, $use_post, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_block_caps( $role, $cap, $use_post, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $use_post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, self::$users[ $role ]->has_cap( $cap, self::$block_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2297,7 +2297,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">- function data_block_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_block_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_caps = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_block',
</span><span class="cx" style="display: block; padding: 0 10px"> 'read_block',
</span></span></pre></div>
<a id="trunktestsphpunittestsusercountUsersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/countUsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/countUsers.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/countUsers.php 2021-11-04 15:22:47 UTC (rev 52010)
</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->assertSameSets( $count, $count2 );
</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">- function data_count_users_strategies() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_count_users_strategies() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'time',
</span></span></pre></div>
<a id="trunktestsphpunittestsuserlistAuthorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/listAuthors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/listAuthors.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/listAuthors.php 2021-11-04 15:22:47 UTC (rev 52010)
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_default() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_default() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['default'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li>' .
</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"> $this->assertSame( $expected['default'], wp_list_authors( array( 'echo' => false ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_orderby() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_orderby() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['post_count'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li>' .
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_order() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_order() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['id'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li>' .
</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">- function test_wp_list_authors_optioncount() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_optioncount() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['optioncount'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> (2)</li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> (3)</li>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,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">- function test_wp_list_authors_exclude_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_exclude_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_show_fullname() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_show_fullname() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['show_fullname'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob reno</a></li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul norris</a></li>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,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">- function test_wp_list_authors_hide_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_hide_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fred_id = self::$fred_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['hide_empty'] =
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_echo() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_echo() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['echo'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li>' .
</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"> wp_list_authors( array( 'echo' => 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">- function test_wp_list_authors_feed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_feed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url0 = get_author_feed_link( self::$user_ids[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> $url1 = get_author_feed_link( self::$user_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_author_feed_link( self::$user_ids[2] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,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">- function test_wp_list_authors_feed_image() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_feed_image() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url0 = get_author_feed_link( self::$user_ids[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> $url1 = get_author_feed_link( self::$user_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_author_feed_link( self::$user_ids[2] );
</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"> * @ticket 26538
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_feed_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_feed_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url0 = get_author_feed_link( self::$user_ids[0], 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> $url1 = get_author_feed_link( self::$user_ids[1], 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_author_feed_link( self::$user_ids[2], 'atom' );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_style() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_style() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['style'] =
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a>, ' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a>, ' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_list_authors_html() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_list_authors_html() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['html'] = 'bob, paul, zack';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span></span></pre></div>
<a id="trunktestsphpunittestsusermapMetaCapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/mapMetaCap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/mapMetaCap.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/mapMetaCap.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @ticket 13905
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capability_type_post_with_invalid_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capability_type_post_with_invalid_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'do_not_allow' ),
</span><span class="cx" style="display: block; padding: 0 10px"> map_meta_cap( 'edit_post', self::$user_id, self::$post_id + 1 )
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capability_type_post_with_no_extra_caps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capability_type_post_with_no_extra_caps() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_custom_capability_type_with_map_meta_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_capability_type_with_map_meta_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,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">- function test_capability_type_post_with_one_renamed_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capability_type_post_with_one_renamed_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capability_type_post_map_meta_cap_true_with_renamed_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capability_type_post_map_meta_cap_true_with_renamed_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,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">- function test_capability_type_post_with_all_meta_caps_renamed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capability_type_post_with_all_meta_caps_renamed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,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">- function test_capability_type_post_with_all_meta_caps_renamed_mapped() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capability_type_post_with_all_meta_caps_renamed_mapped() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_delete_posts_cap_without_map_meta_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_posts_cap_without_map_meta_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> $this->assertSame( 'delete_posts', $post_type_object->cap->delete_posts );
</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">- function test_unfiltered_html_cap() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unfiltered_html_cap() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'DISALLOW_UNFILTERED_HTML' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( DISALLOW_UNFILTERED_HTML );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20488
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_file_edit_caps_not_reliant_on_unfiltered_html_constant() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_file_edit_caps_not_reliant_on_unfiltered_html_constant() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( defined( 'DISALLOW_FILE_MODS' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( defined( 'DISALLOW_FILE_EDIT' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27020
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_authorless_posts_capabilties() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_authorless_posts_capabilties() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37580
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_only_users_who_can_manage_options_can_delete_page_on_front() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_only_users_who_can_manage_options_can_delete_page_on_front() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37580
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_only_users_who_can_manage_options_can_delete_page_for_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_only_users_who_can_manage_options_can_delete_page_for_posts() {
</ins><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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span></span></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/multisite.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> class Tests_Multisite_User extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remove_user_from_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_user_from_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user1 = self::factory()->user->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px"> $user2 = self::factory()->user->create_and_get();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the returned data from get_blogs_of_user()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blogs_of_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blogs_of_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user1_id = self::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"> // Maintain a list of 6 total sites and include the primary network site.
</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"> * @expectedDeprecated is_blog_user
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_blog_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_blog_user() {
</ins><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"> $user1_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
</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"> wp_set_current_user( $old_current );
</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">- function test_is_user_member_of_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_user_member_of_blog() {
</ins><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"> $user1_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23192
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_user_spammy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_user_spammy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</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"> * @ticket 20601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_member_of_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_member_of_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->blog->create();
</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"> $this->assertQueryTrue( 'is_author', 'is_archive' );
</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">- function test_revoked_super_admin_can_be_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revoked_super_admin_can_be_deleted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['super_admins'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_global = $GLOBALS['super_admins'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,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">- function test_revoked_super_admin_is_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revoked_super_admin_is_deleted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['super_admins'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_global = $GLOBALS['super_admins'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</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"> }
</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">- function test_super_admin_cannot_be_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_super_admin_cannot_be_deleted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['super_admins'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_global = $GLOBALS['super_admins'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</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"> * @ticket 27205
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_granting_super_admins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_granting_super_admins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['super_admins'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_global = $GLOBALS['super_admins'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/query.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_and_set() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_and_set() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $users->get( 'fields' ) );
</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"> * @ticket 28631
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_number() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_number() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // +1 for the default user created by the test suite.
</span><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21119
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_prepare_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_query() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $query->query_fields );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $query->query_from );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23849
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_meta_query_with_role() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_meta_query_with_role() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( self::$author_ids[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( self::$author_ids[1], 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsusersessionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/session.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/session.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/session.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_Session extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> remove_all_filters( 'session_token_manager' );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create();
</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"> $this->assertInstanceOf( 'WP_User_Meta_Session_Tokens', $this->manager );
</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">- function test_verify_and_destroy_token() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_verify_and_destroy_token() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expiration = time() + DAY_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> $token = $this->manager->create( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->manager->verify( 'foo' ) );
</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"> $this->assertFalse( $this->manager->verify( $token ) );
</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">- function test_destroy_other_tokens() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_destroy_other_tokens() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expiration = time() + DAY_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> $token_1 = $this->manager->create( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> $token_2 = $this->manager->create( $expiration );
</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"> $this->assertFalse( $this->manager->verify( $token_3 ) );
</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">- function test_destroy_all_tokens() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_destroy_all_tokens() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expiration = time() + DAY_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> $token_1 = $this->manager->create( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> $token_2 = $this->manager->create( $expiration );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserslashesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/slashes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/slashes.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$user_id = $factory->user->create();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the controller function that expects slashed data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST = array();
</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"> * Tests the controller function that expects slashed 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">- function test_edit_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::$user_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_insert_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_insert_user(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'slash_example_user_3',
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the model function that expects slashed 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">- function test_wp_update_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::$user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_update_user(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpAuthenticateSpamCheckphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_authenticate_spam_check_returns_user_when_single_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_authenticate_spam_check_returns_user_when_single_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_user = wp_authenticate_spam_check( $user );
</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"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_authenticate_spam_check_returns_user_when_not_flagged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_authenticate_spam_check_returns_user_when_not_flagged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_user = wp_authenticate_spam_check( $user );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_authenticate_spam_check_returns_wp_error_when_flagged() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_authenticate_spam_check_returns_wp_error_when_flagged() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_user(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpDeleteUserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/wpDeleteUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpDeleteUser.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user/wpDeleteUser.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19500
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_blogs_of_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_blogs_of_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Logged out users don't have blogs.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_blogs_of_user( 0 ) );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19500
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_user_member_of_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_user_member_of_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_current = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
</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"> wp_set_current_user( $old_current );
</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">- function test_delete_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20447
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_delete_user_reassignment_clears_post_caches() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_delete_user_reassignment_clears_post_caches() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $reassign = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_author' => $user_id ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/user.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,13 +60,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$_author = get_user_by( 'ID', self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->author = clone self::$_author;
</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">- function test_get_users_of_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_users_of_blog() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add one of each user role.
</span><span class="cx" style="display: block; padding: 0 10px"> $nusers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$contrib_id,
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Simple get/set tests for user_option functions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_option() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_option() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $val = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Simple tests for usermeta functions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_usermeta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_usermeta() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'key';
</span><span class="cx" style="display: block; padding: 0 10px"> $val = 'value1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test usermeta functions in array mode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_usermeta_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_usermeta_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Some values to set.
</span><span class="cx" style="display: block; padding: 0 10px"> $vals = array(
</span><span class="cx" style="display: block; padding: 0 10px"> rand_str() => 'val-' . rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test property magic functions for property get/set/isset.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_properties() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_properties() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user->data as $key => $data ) {
</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"> * @expectedDeprecated WP_User->id
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20043
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_unset_lowercase_id( $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_unset_lowercase_id( $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->id;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $user->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, $user->id );
</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"> * @depends test_user_unset_lowercase_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20043
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_unset_uppercase_id( $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_unset_uppercase_id( $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $user->ID );
</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"> * Test meta property magic functions for property get/set/isset.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_meta_properties() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_meta_properties() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option( self::$author_id, 'foo', 'foo', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated WP_User->id
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_id_property_back_compat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_id_property_back_compat() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $user->id ) );
</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"> * @ticket 19265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_level_property_back_compat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_level_property_back_compat() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $roles = array(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$admin_id => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$editor_id => 7,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,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">- function test_construction() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construction() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $user );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::$author_id, $user->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $user->user_login, $user7->user_login );
</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">- function test_get() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'author_login', $user->get( 'user_login' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'author@email.com', $user->get( 'user_email' ) );
</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"> $this->assertSame( 'abcdefg', $user->get( 'dashed-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">- function test_has_prop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_prop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_prop( 'user_email' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_prop( 'use_ssl' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_prop( 'dashed-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">- function test_update_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( self::$author_id, 'description', 'about me' );
</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"> * @ticket 19595
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_global_userdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_global_userdata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $userdata, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$sub_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,13 +445,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19769
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_global_userdata_is_null_when_logged_out() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_global_userdata_is_null_when_logged_out() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $userdata;
</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->assertNull( $userdata );
</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">- function test_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists() );
</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"> $this->assertFalse( $user->exists() );
</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">- function test_global_authordata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_global_authordata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $authordata, $id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_post_id = $id;
</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"> * @ticket 13317
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_userdata() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_userdata() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_userdata( 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_userdata( '0' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_userdata( 'string' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,7 +508,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23480
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_get_data_by_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_get_data_by_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = WP_User::get_data_by( 'id', self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'stdClass', $user );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( self::$author_id, $user->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21431
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_count_many_users_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_count_many_users_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id_b = self::factory()->user->create( array( 'role' => 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id_a = self::factory()->post->create( array( 'post_author' => self::$author_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id_b = self::factory()->post->create( array( 'post_author' => $user_id_b ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22858
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_user_on_nonexistent_users() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_user_on_nonexistent_users() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> // Find me a non-existent user ID.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( get_userdata( $user_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28435
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_user_should_not_change_password_when_passed_WP_User_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_user_should_not_change_password_when_passed_WP_User_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $testuserid = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $testuserid );
</span><span class="cx" style="display: block; padding: 0 10px"> $pwd_before = $user->user_pass;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +609,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45747
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_update_user_should_not_mark_user_as_spam_on_single_site() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_update_user_should_not_mark_user_as_spam_on_single_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $u = wp_update_user(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => self::$contrib_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28315
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_meta_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_meta_error() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id1 = wp_insert_user(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,7 +664,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30647
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_user_update_email_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_update_email_error() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id1 = wp_insert_user(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'blackburn',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,9 +707,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"> * @ticket 27317
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _illegal_user_logins_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_illegal_user_logins
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_illegal_user_logins_single( $user_login ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_illegal_user_logins_single( $user_login ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => $user_login,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'testuser@example.com',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,13 +716,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => wp_generate_password(),
</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">- add_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'illegal_user_logins', array( $this, 'illegal_user_logins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_insert_user( $user_data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'invalid_username', $response->get_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">- remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'illegal_user_logins', array( $this, 'illegal_user_logins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_insert_user( $user_data );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,18 +731,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"> * @ticket 27317
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider _illegal_user_logins_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_illegal_user_logins
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_illegal_user_logins_single_wp_create_user( $user_login ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_illegal_user_logins_single_wp_create_user( $user_login ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_email = 'testuser-' . $user_login . '@example.com';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'illegal_user_logins', array( $this, 'illegal_user_logins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = register_new_user( $user_login, $user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'invalid_username', $response->get_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">- remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'illegal_user_logins', array( $this, 'illegal_user_logins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = register_new_user( $user_login, $user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,19 +753,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27317
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_illegal_user_logins_multisite() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_illegal_user_logins_multisite() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'testuser',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'testuser@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'illegal_user_logins', array( $this, 'illegal_user_logins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wpmu_validate_user_signup( $user_data['user_login'], $user_data['user_email'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $response['errors'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'user_name', $response['errors']->get_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">- remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'illegal_user_logins', array( $this, 'illegal_user_logins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wpmu_validate_user_signup( $user_data['user_login'], $user_data['user_email'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $response['errors'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -772,7 +772,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 0, $response['errors']->get_error_codes() );
</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">- function _illegal_user_logins_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_illegal_user_logins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'testuser' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +784,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _illegal_user_logins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function illegal_user_logins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'testuser' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1163,7 +1163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_email_case() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_email_case() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Alter the case of the email address (which stays the same).
</span><span class="cx" style="display: block; padding: 0 10px"> $userdata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,7 +1177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_email_change() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_email_change() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Change the email address.
</span><span class="cx" style="display: block; padding: 0 10px"> $userdata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1200,7 +1200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33654
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36009
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $was_admin_email_sent = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1243,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">- function data_wp_new_user_notifications() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_new_user_notifications() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1280,7 +1280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33654
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_new_user_notification
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_new_user_notification_old_signature_throws_deprecated_warning_but_sends() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_new_user_notification_old_signature_throws_deprecated_warning_but_sends() {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $was_admin_email_sent = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1305,7 +1305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34377
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_new_user_notification_old_signature_no_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_new_user_notification_old_signature_no_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $was_admin_email_sent = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1330,7 +1330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40015
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_admin_email_notification_html_entities_decoded() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_admin_email_notification_html_entities_decoded() {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><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_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,7 +1363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_user_admin_email_confirmation_emails
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_admin_email_confirmation_not_sent_when_email_invalid( $email, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_admin_email_confirmation_not_sent_when_email_invalid( $email, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option_new_admin_email( get_option( 'admin_email' ), $email );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1383,7 +1383,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">- function data_user_admin_email_confirmation_emails() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_user_admin_email_confirmation_emails() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> get_option( 'admin_email' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1404,7 +1404,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_user_change_email_confirmation_emails
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_profile_email_confirmation_not_sent_invalid_email( $email, $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_profile_email_confirmation_not_sent_invalid_email( $email, $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_current = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1447,7 +1447,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">- function data_user_change_email_confirmation_emails() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_user_change_email_confirmation_emails() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'email@test.dev',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1470,7 +1470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35715
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42766
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_edit_user_blank_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_user_blank_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1544,7 +1544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Check passwords action for test_edit_user_blank_password().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function action_check_passwords_blank_password( $user_login, &$pass1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function action_check_passwords_blank_password( $user_login, &$pass1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pass1 = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1551,7 +1551,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16470
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_send_confirmation_on_profile_email() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_send_confirmation_on_profile_email() {
</ins><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $was_confirmation_email_sent = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1586,7 +1586,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16470
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_remove_send_confirmation_on_profile_email() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_remove_send_confirmation_on_profile_email() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1626,7 +1626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16470
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40015
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_send_confirmation_on_profile_email_html_entities_decoded() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_send_confirmation_on_profile_email_html_entities_decoded() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,7 +1662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42564
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_edit_user_role_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_user_role_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1705,7 +1705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43547
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_user_personal_data_exporter_no_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_user_personal_data_exporter_no_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_user_personal_data_exporter( 'not-a-user-email@test.com' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1722,7 +1722,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43547
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_user_personal_data_exporter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_user_personal_data_exporter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_user = new WP_User( self::$contrib_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_user_personal_data_exporter( $test_user->user_email );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1742,7 +1742,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43921
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_community_events_location_ip_personal_data_exporter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_community_events_location_ip_personal_data_exporter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_user = new WP_User( self::$contrib_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $location_data = array( 'ip' => '0.0.0.0' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1766,7 +1766,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43921
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_community_events_location_city_personal_data_exporter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_community_events_location_city_personal_data_exporter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_user = new WP_User( self::$contrib_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $location_data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1808,7 +1808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45889
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_session_tokens_personal_data_exporter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_session_tokens_personal_data_exporter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_user = new WP_User( self::$contrib_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $session_tokens_data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1924,7 +1924,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47509
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_filter_wp_privacy_additional_user_profile_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filter_wp_privacy_additional_user_profile_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_user = new WP_User( self::$contrib_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_privacy_additional_user_profile_data', array( $this, 'export_additional_user_profile_data' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestswalkerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/walker.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/walker.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Walker extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->walker = new Walker_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">- function test_single_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_item() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_single_item_flat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_item_flat() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_single_item_depth_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_item_depth_1() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_items_single_level() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_single_level() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_items_multiple_levels() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_multiple_levels() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_items_multiple_levels_flat() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_multiple_levels_flat() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_items_multiple_levels_depth_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_multiple_levels_depth_1() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_items_multiple_levels_depth_2() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_multiple_levels_depth_2() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,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">- function test_multiple_items_recursive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_recursive() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_single_item_child() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_item_child() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,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">- function test_single_item_missing_parent_depth_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_single_item_missing_parent_depth_1() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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">
</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">- function test_multiple_items_missing_parents() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_missing_parents() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,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">- function test_multiple_items_missing_parents_depth_1() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_missing_parents_depth_1() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53474
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multiple_items_non_numeric_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiple_items_non_numeric_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,19 +320,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => '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">- function start_lvl( &$output, $depth = 0, $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '<ul>';
</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">- function end_lvl( &$output, $depth = 0, $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function end_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '</ul>';
</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">- function start_el( &$output, $item, $depth = 0, $args = array(), $current_page = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $item, $depth = 0, $args = array(), $current_page = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '<li>' . $item->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">- function end_el( &$output, $page, $depth = 0, $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function end_el( &$output, $page, $depth = 0, $args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '</li>';
</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="trunktestsphpunittestswidgetswpWidgetCustomHtmlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46421
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_links_with_target() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_links_with_target() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Custom_HTML();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = 'Test content with an external <a href="https://example.org" target="_blank">link</a>.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46421
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_links_without_target() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_links_without_target() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Custom_HTML();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = 'Test content with an internal <a href="/">link</a>.';
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetswpWidgetMediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Scripts $wp_scripts
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Styles $wp_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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</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"> * @param array $control_options Optional. Widget control options.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return PHPUnit_Framework_MockObject_MockObject|WP_Widget_Media Mocked instance.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_mocked_class_instance( $id_base = 'mocked', $name = 'Mocked', $widget_options = array(), $control_options = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_mocked_class_instance( $id_base = 'mocked', $name = 'Mocked', $widget_options = array(), $control_options = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_class_name = 'WP_Widget_Media';
</span><span class="cx" style="display: block; padding: 0 10px"> $arguments = array( $id_base, $name, $widget_options, $control_options );
</span><span class="cx" style="display: block; padding: 0 10px"> $mock_class_name = '';
</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"> * @covers WP_Widget_Media::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::_register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->_register();
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers WP_Widget_Media::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::_register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor_in_customize_preview() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor_in_customize_preview() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory()->user->create(
</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"> * @covers WP_Widget_Media::is_attachment_with_mime_type
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_attachment_with_mime_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_attachment_with_mime_type() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $test_image = get_temp_dir() . 'canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::sanitize_token_list
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_sanitize_token_list_string() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_sanitize_token_list_string() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->sanitize_token_list( 'What A false class with-token <a href="#">and link</a>' );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::get_instance_schema
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $widget->get_instance_schema();
</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"> * @covers WP_Widget_Media::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'sanitize_text_field', array( $this, '_return_wp_error' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'sanitize_text_field', array( $this, 'return_wp_error' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Title',
</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"> $instance
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'sanitize_text_field', array( $this, '_return_wp_error' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'sanitize_text_field', array( $this, 'return_wp_error' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 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"> * @return \WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _return_wp_error() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function return_wp_error() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'some-error', 'This is not valid!' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers WP_Widget_Media::widget
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::render_media
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_widget() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_widget() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h2>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => "</h2>\n",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Widget_Media $object Widget object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Instance.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_widget_mocked_instance( $instance, $args, $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_widget_mocked_instance( $instance, $args, $object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->widget_instance_filter_args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::form
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_form() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_form() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::display_media_state
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_display_media_state() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_display_media_state() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</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"> * @covers WP_Widget_Media::enqueue_admin_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">- function test_enqueue_admin_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_admin_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'widgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->enqueue_admin_scripts();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::render_control_template_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">- function test_render_control_template_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_control_template_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = $this->get_mocked_class_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::has_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">- function test_has_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_has_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => DIR_TESTDATA . '/images/canola.jpg',
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetswpWidgetMediaAudiophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Scripts $wp_scripts
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Styles $wp_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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Audio::get_instance_schema
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_widget_audio = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $wp_widget_audio->get_instance_schema();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45029
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema_filtering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema_filtering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_widget_audio = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $wp_widget_audio->get_instance_schema();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Audio::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'mime_type', $widget->widget_options );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Audio::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Audio::render_media
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_media() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_media() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_audio_file = __FILE__ . '../../data/uploads/small-audio.mp3';
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Styles $wp_styles
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Audio::enqueue_preview_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">- function test_enqueue_preview_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_preview_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles = null;
</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"> * @covers WP_Widget_Media_Audio::enqueue_admin_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">- function test_enqueue_admin_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_admin_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'widgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->enqueue_admin_scripts();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,7 +315,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Audio::render_control_template_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">- function test_render_control_template_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_control_template_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Audio();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetswpWidgetMediaImagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/wpWidgetMediaImage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/wpWidgetMediaImage.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets/wpWidgetMediaImage.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Scripts $wp_scripts
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Styles $wp_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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Image::get_instance_schema
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $widget->get_instance_schema();
</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"> * @ticket 45029
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema_filtering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema_filtering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $widget->get_instance_schema();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Image::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'mime_type', $widget->widget_options );
</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"> * @covers WP_Widget_Media_Image::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers WP_Widget_Media_Image::render_media
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_media() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_media() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $test_image = get_temp_dir() . 'canola.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,7 +608,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Image::enqueue_admin_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">- function test_enqueue_admin_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_admin_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'widgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->enqueue_admin_scripts();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +621,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Image::render_control_template_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">- function test_render_control_template_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_control_template_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetswpWidgetMediaVideophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Scripts $wp_scripts
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Styles $wp_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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Video::get_instance_schema
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $widget->get_instance_schema();
</span><span class="cx" style="display: block; padding: 0 10px">
</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><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45029
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_instance_schema_filtering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_instance_schema_filtering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $widget->get_instance_schema();
</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"> * @covers WP_Widget_Media_Video::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_constructor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_constructor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'mime_type', $widget->widget_options );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Video::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @covers WP_Widget_Media_Video::render_media
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Video::inject_video_max_width_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">- function test_render_media() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_media() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $test_movie_file = __FILE__ . '../../data/uploads/small-video.m4v';
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</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"> * @global WP_Styles $wp_styles
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Video::enqueue_preview_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">- function test_enqueue_preview_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_preview_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Video::enqueue_admin_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">- function test_enqueue_admin_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_admin_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'widgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->enqueue_admin_scripts();
</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"> * @covers WP_Widget_Media_Video::render_control_template_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">- function test_render_control_template_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_control_template_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Video();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetswpWidgetTextphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/wpWidgetText.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/wpWidgetText.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets/wpWidgetText.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> * @global WP_Styles $wp_style
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Customize_Manager $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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles, $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_construct() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'text', $widget->id_base );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'widget_text', $widget->widget_options['classname'] );
</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"> * @covers WP_Widget_Text::_register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test__register() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__register() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'widgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->_register();
</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"> * @covers WP_Widget_Text::__construct
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::_register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test__register_in_customize_preview() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test__register_in_customize_preview() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory()->user->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Styles $wp_styles
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::enqueue_preview_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">- function test_enqueue_preview_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_preview_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts, $wp_styles;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles = null;
</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><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::widget
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_widget() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_widget() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n Praesent ut turpis consequat lorem volutpat bibendum vitae vitae ante.";
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Shortcode 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">- function do_example_shortcode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function do_example_shortcode() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post_during_shortcode = get_post();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->shortcode_render_count++;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->example_shortcode_content;
</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"> * @covers WP_Widget_Text::widget
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_widget_shortcodes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_widget_shortcodes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Widget_Text $widget Current Text widget instance.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Widget text.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function filter_widget_text( $widget_text, $instance, $widget ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_widget_text( $widget_text, $instance, $widget ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->widget_text_args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_text .= '[filter:widget_text]';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Widget_Text $widget Current Text widget instance.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Widget 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">- function filter_widget_text_content( $widget_text, $instance, $widget ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_widget_text_content( $widget_text, $instance, $widget ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->widget_text_content_args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_text .= '[filter:widget_text_content]';
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::is_legacy_instance
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_is_legacy_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_legacy_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $base_instance = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,7 +630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::form
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_form() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_form() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'user_can_richedit', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->_set( 2 );
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => "The\nTitle",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,7 +755,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_legacy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_legacy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // --
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -953,7 +953,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $cap Capability name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Caps.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function grant_unfiltered_html_cap( $caps, $cap ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function grant_unfiltered_html_cap( $caps, $cap ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'unfiltered_html' === $cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = array_diff( $caps, array( 'do_not_allow' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'unfiltered_html';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $cap Capability name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Caps.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function revoke_unfiltered_html_cap( $caps, $cap ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function revoke_unfiltered_html_cap( $caps, $cap ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'unfiltered_html' === $cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = array_diff( $caps, array( 'unfiltered_html' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'do_not_allow';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,7 +981,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::enqueue_admin_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">- function test_enqueue_admin_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enqueue_admin_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'widgets.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->enqueue_admin_scripts();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Text::render_control_template_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">- function test_render_control_template_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_control_template_scripts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Widget_Text::render_control_template_scripts();
</span><span class="cx" style="display: block; padding: 0 10px"> $output = ob_get_clean();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1007,7 +1007,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46421
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_links_with_target() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_links_with_target() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text = 'Test content with an external <a href="https://example.org" target="_blank">link</a>.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,7 +1034,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46421
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_render_links_without_target() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_render_links_without_target() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Text();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text = 'Test content with an internal <a href="/">link</a>.';
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/widgets.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> public $sidebar_index;
</span><span class="cx" style="display: block; padding: 0 10px"> public $valid_sidebar;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory, $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_sidebars = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::clean_up_global_scope();
</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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = null;
</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"> * @see register_widget()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see unregister_widget()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_and_unregister_widget_core_widget() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_and_unregister_widget_core_widget() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_class = 'WP_Widget_Search';
</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"> * @see unregister_widget()
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28216
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_and_unregister_widget_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_and_unregister_widget_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory, $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wp_widget_factory->widgets );
</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><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_sidebars_single() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_sidebars_single() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebars( 1, array( 'id' => 'wp-unit-test' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_sidebars_multiple() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_sidebars_multiple() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_sidebar_with_no_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_sidebar_with_no_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'register_sidebar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unregister_sidebar_registered_with_no_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unregister_sidebar_registered_with_no_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'register_sidebar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_sidebar_with_string_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_sidebar_with_string_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 'wp-unit-test';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unregister_sidebar_with_string_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unregister_sidebar_with_string_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 'wp-unit-tests';
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_register_sidebar_with_numeric_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_register_sidebar_with_numeric_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 2;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_unregister_sidebar_with_numeric_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_unregister_sidebar_with_numeric_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 2;
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Utility hook callback used to store a sidebar ID mid-function.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function retrieve_sidebar_id( $index, $valid_sidebar ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function retrieve_sidebar_id( $index, $valid_sidebar ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sidebar_index = $index;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->valid_sidebar = $valid_sidebar;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dynamic_sidebar_using_sidebar_registered_with_no_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dynamic_sidebar_using_sidebar_registered_with_no_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'register_sidebar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Incorrectly register a couple of sidebars for fun.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dynamic_sidebar_using_invalid_sidebar_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dynamic_sidebar_using_invalid_sidebar_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array( 'id' => 'wp-unit-text' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'dynamic_sidebar_before', array( $this, 'retrieve_sidebar_id' ), 10, 2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dynamic_sidebar_numeric_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dynamic_sidebar_numeric_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 2;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_dynamic_sidebar_string_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_dynamic_sidebar_string_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = 'wp-unit-tests';
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget_Search::form()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_search_form() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_search_form() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Search( 'foo', 'Foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::form()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_form() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_form() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget( 'foo', 'Foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = $widget->form( array() );
</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"> * @see WP_Widget::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_constructor() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_constructor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id_base = 'foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'Foo';
</span><span class="cx" style="display: block; padding: 0 10px"> $foo_widget = new WP_Widget( $id_base, $name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_widget_classname
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_classname( $expected, $widget_class ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_classname( $expected, $widget_class ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/widgets/custom-widget-classes.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new $widget_class( '', 'Foo' );
</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"> * }
</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">- function data_wp_widget_classname() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_widget_classname() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'widget_search',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::get_field_name()
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_widget_get_field_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">- function test_wp_widget_get_field_name( $expected, $value_to_test ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_get_field_name( $expected, $value_to_test ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget( 'foo', 'Foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->_set( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $widget->get_field_name( $value_to_test ) );
</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"> * }
</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">- function data_wp_widget_get_field_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_widget_get_field_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'widget-foo[2][title]',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,7 +522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::get_field_id()
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_widget_get_field_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">- function test_wp_widget_get_field_id( $expected, $value_to_test ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_get_field_id( $expected, $value_to_test ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget( 'foo', 'Foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget->_set( 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $widget->get_field_id( $value_to_test ) );
</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"> * }
</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">- function data_wp_widget_get_field_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_widget_get_field_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'widget-foo-2-title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +571,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::_register()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget__register() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget__register() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = get_option( 'widget_block' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::is_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">- function test_wp_widget_is_preview() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_is_preview() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget( 'foo', 'Foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,7 +616,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::get_settings()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_get_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_get_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $option_value = get_option( 'widget_block' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::save_settings()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_save_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_save_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +684,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget::save_settings()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_save_settings_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_save_settings_delete() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_widget_control()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_widget_control() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_widget_control() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,7 +779,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">- function test_the_widget_custom_before_title_arg() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_widget_custom_before_title_arg() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_widget( 'WP_Widget_Text' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -808,7 +808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see \the_widget()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_the_widget_with_unregistered_widget() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_the_widget_with_unregistered_widget() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'the_widget' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_widget( 'Widget_Class' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +834,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $sidebars Sidebar slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function register_sidebars( $sidebars ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function register_sidebars( $sidebars ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars as $sidebar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array( 'id' => $sidebar ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @covers ::retrieve_widgets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_retrieve_widgets_with_theme_mod() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_retrieve_widgets_with_theme_mod() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets, $_wp_sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,7 +908,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::retrieve_widgets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,7 +946,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::retrieve_widgets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets, $_wp_sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::retrieve_widgets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_retrieve_widgets_for_customizer() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_retrieve_widgets_for_customizer() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets, $_wp_sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,7 +1082,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
</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">- function test_retrieve_widgets_with_single_widget() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_retrieve_widgets_with_single_widget() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,7 +1109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::retrieve_widgets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_retrieve_widgets_move_orphaned_widgets_to_inactive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_retrieve_widgets_move_orphaned_widgets_to_inactive() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_widgets_init();
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcbasicphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/basic.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/basic.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group xmlrpc
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_Basic extends WP_XMLRPC_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_enabled() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_enabled() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</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"> $this->assertSame( 403, $result->code );
</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">- function test_login_pass_ok() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_login_pass_ok() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->myxmlrpcserver->login_pass_ok( 'subscriber', 'subscriber' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $this->myxmlrpcserver->login( 'subscriber', 'subscriber' ) );
</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">- function test_login_pass_bad() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_login_pass_bad() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->myxmlrpcserver->login_pass_ok( 'username', 'password' ) );
</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"> * @ticket 34336
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_multicall_invalidates_all_calls_after_invalid_call() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multicall_invalidates_all_calls_after_invalid_call() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</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"> array(
</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"> * @ticket 36586
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_isStruct_on_non_numerically_indexed_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_isStruct_on_non_numerically_indexed_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = new IXR_Value( array( '0.0' => 100 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return = "<struct>\n";
</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"> $this->assertXmlStringEqualsXmlString( $return, $value->getXML() );
</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">- function test_disabled() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_disabled() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xmlrpc_enabled', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> $testcase_xmlrpc_server = new wp_xmlrpc_server();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $testcase_xmlrpc_server->wp_getOptions( array( 1, 'username', 'password' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcclientphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/client.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/client.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/client.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26947
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_ixr_client_allows_query_strings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ixr_client_allows_query_strings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $client = new IXR_Client( 'http://example.com/server.php?this-is-needed=true#not-this' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'example.com', $client->server );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 80, $client->port );
</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"> * @ticket 26947
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_ixr_client_allows_query_strings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_ixr_client_allows_query_strings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $client = new WP_HTTP_IXR_Client( 'http://example.com/server.php?this-is-needed=true#not-this' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'example.com', $client->server );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $client->port );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmtgetRecentPostTitlesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_mt_getRecentPostTitles extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mt_getRecentPostTitles( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_no_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mt_getRecentPostTitles( array( 1, 'author', 'author' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 500, $result->code );
</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">- function test_no_editable_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_editable_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create( array( 'post_author' => $editor ) );
</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"> $this->assertCount( 0, $result );
</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">- function test_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create();
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmweditPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_XMLRPC_mw_editPost extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_editPost( array( 1, 'username', 'password', $post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</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"> $this->assertSame( 403, $result->code );
</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">- function test_edit_own_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_own_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post test',
</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"> $this->assertSame( $new_title, $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capable_edit_others_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_edit_others_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</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->assertSame( $new_title, $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_edit_others_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_edit_others_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</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"> $this->assertSame( $original_title, $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capable_reassign_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_reassign_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $author_id, $out->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_reassign_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_reassign_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24916
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capable_reassign_author_to_self() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_reassign_author_to_self() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</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"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_edit_basic_post_info() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_basic_post_info() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20662
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_make_post_sticky() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_make_post_sticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Not allowed since [19914].
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_change_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_change_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16980
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_not_null() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_not_null() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,17 +300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35874
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_draft_not_prematurely_published() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_draft_not_prematurely_published() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,13 +21,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getPost( array( self::$post_id, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getPost( array( self::$post_id, 'subscriber', 'subscriber' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,13 +38,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20336
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_postid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_postid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getPost( array( 9999, 'author', 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 404, $result->code );
</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">- function test_valid_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post' );
</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"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create attachment.
</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"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getPost( array( self::$post_id, 'author', 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetRecentPostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getRecentPosts( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22320
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_editing_privileges() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_editing_privileges() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getRecentPosts( array( 1, 'subscriber', 'subscriber' ) );
</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"> $this->assertSame( 401, $result->code );
</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">- function test_no_editable_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_editable_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( self::$post_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_getRecentPosts( array( 1, 'author', 'author' ) );
</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"> $this->assertCount( 0, $result );
</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">- function test_valid_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post' );
</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"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create attachment.
</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"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->mw_getRecentPosts( array( 1, 'editor', 'editor' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwnewPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_XMLRPC_mw_newPost extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_newPost( array( 1, 'username', 'password', $post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</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"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,17 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_no_content() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,17 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Content, title, and excerpt are empty.', $result->message );
</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">- function test_basic_content() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_basic_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array( 'title' => 'Test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,17 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result );
</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">- function test_ignore_id() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignore_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,17 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( '103948', $result );
</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">- function test_capable_publish() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_publish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,17 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_capable_other_author() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_other_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $other_author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_other_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_other_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $other_author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20356
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,17 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 404, $result->code );
</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">- function test_empty_author() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $my_author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array( 'title' => 'Test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_set_post_type_as_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_set_post_type_as_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,17 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_capable_set_post_type_as_page() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_set_post_type_as_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,17 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16985
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_draft_post_date() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_draft_post_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpdeletePostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_deletePost extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deletePost( array( 1, 'username', 'password', 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_invalid_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deletePost( array( 1, 'editor', 'editor', 340982340 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 404, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</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"> $this->assertSame( 401, $result->code );
</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">- function test_post_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_deleted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpdeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,13 +14,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'username', 'password', 'category', 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_empty_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'subscriber', 'subscriber', '', 0 ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'subscriber', 'subscriber', 'not_existing', 0 ) );
</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->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'subscriber', 'subscriber', 'category', self::$term_id ) );
</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"> $this->assertSame( __( 'Sorry, you are not allowed to delete this term.' ), $result->message );
</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">- function test_empty_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'editor', 'editor', 'category', '' ) );
</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"> $this->assertSame( __( 'Empty Term.' ), $result->message );
</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">- function test_invalid_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'editor', 'editor', 'category', 9999 ) );
</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"> $this->assertSame( __( 'Invalid term ID.' ), $result->message );
</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">- function test_term_deleted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_deleted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'editor', 'editor', 'category', self::$term_id ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_XMLRPC_wp_editComment extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_author_can_edit_own_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_can_edit_own_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</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"> array(
</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->assertTrue( $result );
</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">- function test_author_cannot_edit_others_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_cannot_edit_others_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(
</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"> $this->assertSame( __( 'Sorry, you are not allowed to moderate or edit this comment.' ), $result->message );
</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">- function test_trash_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_trash_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_editPost extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editPost( array( 1, 'username', 'password', 0, array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_edit_own_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_own_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</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"> $this->assertSame( $new_title, $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capable_edit_others_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_edit_others_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $new_title, $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_edit_others_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_edit_others_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</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"> $this->assertSame( $original_title, $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capable_reassign_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_reassign_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $author_id, $out->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_reassign_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_reassign_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24916
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_capable_reassign_author_to_self() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_reassign_author_to_self() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</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"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_edit_custom_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_custom_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor_id = $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</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"> $this->assertSame( $created_object, '12345678' );
</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">- function test_capable_unsticky() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_unsticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_author' => $editor_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_sticky( $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">- function test_password_transition_unsticky() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_password_transition_unsticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // When transitioning to private status or adding a post password, post should be un-stuck.
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_author' => $editor_id ) );
</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"> $this->assertFalse( is_sticky( $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">- function test_if_not_modified_since() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_if_not_modified_since() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $yesterday = strtotime( '-1 day' );
</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"> $this->assertSame( 'First edit', get_post( $post_id )->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">- function test_edit_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'inherit', get_post( $post_id )->post_status );
</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">- function test_use_invalid_post_status() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_use_invalid_post_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create(
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22220
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_loss_of_categories_on_edit() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_loss_of_categories_on_edit() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_author' => $editor_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26686
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_clear_categories_on_edit() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_clear_categories_on_edit() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_author' => $editor_id ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23219
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_add_enclosure_if_new() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_enclosure_if_new() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Sample enclosure data.
</span><span class="cx" style="display: block; padding: 0 10px"> $enclosure = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'http://example.com/sound.mp3',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,17 +467,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35874
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_draft_not_prematurely_published() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_draft_not_prematurely_published() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,17 +503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45322
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_draft_not_assigned_published_date() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_draft_not_assigned_published_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Start with a draft post, confirming its post_date_gmt is "zero".
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditProfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_editProfile extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editProfile( array( 1, 'username', 'password', array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_subscriber_profile() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_subscriber_profile() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber_id = $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $new_data = array(
</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"> $this->assertSame( $new_data['bio'], $user_data->description );
</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">- function test_ignore_password_change() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignore_password_change() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_pass = 'newpassword';
</span><span class="cx" style="display: block; padding: 0 10px"> $new_data = array( 'password' => $new_pass );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $auth_new );
</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">- function test_ignore_email_change() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignore_email_change() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_email = 'notaneditor@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $new_data = array( 'email' => $new_email );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,13 +26,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'username', 'password', 'category', 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_empty_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'subscriber', 'subscriber', '', array( 'taxonomy' => '' ) ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'subscriber', 'subscriber', self::$parent_term, array( 'taxonomy' => 'not_existing' ) ) );
</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->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'subscriber', 'subscriber', self::$parent_term, array( 'taxonomy' => 'category' ) ) );
</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"> $this->assertSame( __( 'Sorry, you are not allowed to edit this term.' ), $result->message );
</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">- function test_term_not_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_not_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', 9999, array( 'taxonomy' => 'category' ) ) );
</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"> $this->assertSame( __( 'Invalid term ID.' ), $result->message );
</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">- function test_empty_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', '', array( 'taxonomy' => 'category' ) ) );
</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"> $this->assertSame( __( 'Empty Term.' ), $result->message );
</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">- function test_empty_term_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_term_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm(
</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"> $this->assertSame( __( 'The term name cannot be empty.' ), $result->message );
</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">- function test_parent_for_nonhierarchical() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_for_nonhierarchical() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( __( 'Cannot set parent term, taxonomy is not hierarchical.' ), $result->message );
</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">- function test_parent_empty() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_empty() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm(
</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"> $this->assertTrue( $result );
</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">- function test_parent_null() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_null() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm(
</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"> $this->assertEquals( '0', $term->parent );
</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">- function test_parent_invalid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_invalid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm(
</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"> $this->assertSame( 500, $result->code );
</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">- function test_parent_not_existing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_not_existing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm(
</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->assertSame( __( 'Parent term does not exist.' ), $result->message );
</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">- function test_parent_duplicate_slug() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_duplicate_slug() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_term = get_term_by( 'id', self::$parent_term, 'category' );
</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"> $this->assertSame( htmlspecialchars( sprintf( __( 'The slug “%s” is already in use by another term.' ), $parent_term->slug ) ), $result->message );
</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">- function test_edit_all_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_edit_all_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,13 +33,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$child_comment_id = wp_insert_comment( self::$child_comment_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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComment( array( 1, 'username', 'password', self::$parent_comment_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComment( array( 1, 'contributor', 'contributor', self::$parent_comment_id ) );
</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"> $this->assertSame( 403, $result->code );
</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">- function test_valid_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComment( array( 1, 'editor', 'editor', self::$parent_comment_id ) );
</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"> $this->assertSame( self::$parent_comment_data['comment_author_email'], $result['author_email'] );
</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">- function test_valid_child_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_child_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComment( array( 1, 'editor', 'editor', self::$child_comment_id ) );
</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"> $this->assertEquals( self::$parent_comment_id, $result['parent'] );
</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">- function test_invalid_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComment( array( 1, 'editor', 'editor', 123456789 ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_XMLRPC_wp_getComments extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public $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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComments( array( 1, 'username', 'password', array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getComments( array( 1, 'contributor', 'contributor', array() ) );
</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"> $this->assertSame( 401, $result->code );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->comment->create_post_comments( $this->post_id, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->comment->create_post_comments( $this->post_id, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</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><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">- function test_number_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_number_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->comment->create_post_comments( $this->post_id, 11 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 5, $results2 );
</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">- function test_contributor_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_contributor_capabilities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_post_id = self::factory()->post->create(
</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"> $this->assertSame( 401, $result->code );
</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">- function test_author_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_author_capabilities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_post_id = self::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">@@ -229,7 +229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result4 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_editor_capabilities() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_editor_capabilities() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_post_id = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetMediaItemphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> self::$post_id = $factory->post->create();
</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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</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"> set_post_thumbnail( self::$post_id, $this->attachment_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">- function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tear_down() {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->remove_added_uploads();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,13 +37,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getMediaItem( array( 1, 'username', 'password', 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_valid_media_item() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_media_item() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post' );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetOptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getOptions extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_valid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WordPress', $result['software_name']['value'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_option_value() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_option_value() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'administrator', 'administrator', 'default_comment_status' ) );
</span><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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20201
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_option_values_subscriber() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_option_values_subscriber() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_version;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result['default_ping_status']['readonly'] );
</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">- function test_option_values_admin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_option_values_admin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_version;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPage( array( 1, self::$post_id, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20336
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_pageid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_pageid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPage( array( 1, 9999, 'editor', 'editor' ) );
</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"> $this->assertSame( 404, $result->code );
</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">- function test_valid_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPage( array( 1, self::$post_id, 'editor', 'editor' ) );
</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"> $this->assertStringMatchesFormat( '%d', $result['wp_author_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">- function test_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPage( array( 1, self::$post_id, 'editor', 'editor' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPageListphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPageList.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPageList.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPageList.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,13 +22,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPageList( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPageList( array( 1, 'contributor', 'contributor' ) );
</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"> $this->assertSame( 401, $result->code );
</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">- function test_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getPageList( array( 1, 'editor', 'editor' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPages.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPages.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPages( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPages( array( 1, 'contributor', 'contributor' ) );
</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"> $this->assertSame( 401, $result->code );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getPages( array( 1, 'administrator', 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function remove_editor_edit_page_cap( $caps, $cap, $user_id, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function remove_editor_edit_page_cap( $caps, $cap, $user_id, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $cap, array( 'edit_page', 'edit_others_pages' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id === self::$editor_id && $args[0] === self::$post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( false );
</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"> * @ticket 20629
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_semi_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_semi_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'map_meta_cap', array( $this, 'remove_editor_edit_page_cap' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getPages( array( 1, 'editor', 'editor' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> public $post_date_ts;
</span><span class="cx" style="display: block; padding: 0 10px"> public $post_custom_field;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_date_ts = strtotime( '+1 day' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,13 +28,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_custom_field['id'] = add_post_meta( $this->post_id, $this->post_custom_field['key'], $this->post_custom_field['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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'username', 'password', 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_valid_post() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post', 'custom_fields' );
</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"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $this->post_id, $fields ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'post_id' ), array_keys( $result ) );
</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">- function test_default_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_default_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $this->post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</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->assertArrayHasKey( 'custom_fields', $result );
</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">- function test_date() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $this->post_id, $fields ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21308
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_page() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostTypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> public $cpt_name;
</span><span class="cx" style="display: block; padding: 0 10px"> public $cpt_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cpt_name = 'post_type_test';
</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"> register_post_type( $this->cpt_name, $this->cpt_args );
</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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostType( array( 1, 'username', 'password', 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_invalid_post_type_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_type_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostType( array( 1, 'editor', 'editor', 'foobar' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_valid_post_type_name() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_post_type_name() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostType( array( 1, 'editor', 'editor', 'post' ) );
</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"> $this->assertNotIXRError( $result );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostType( array( 1, 'subscriber', 'subscriber', 'post' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_valid_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostType( array( 1, 'editor', 'editor', $this->cpt_name, array( 'labels', 'cap', 'menu', 'taxonomies' ) ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostTypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php 2021-11-04 15:22:47 UTC (rev 52010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group xmlrpc
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getPostTypes extends WP_XMLRPC_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'username', 'password', 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'subscriber', 'subscriber' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 0, $result );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'editor', 'editor' ) );
</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"> $this->assertGreaterThan( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_simple_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_simple_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'editor', 'editor', array( 'hierarchical' => true ) ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2021-11-04 15:22:47 UTC (rev 52010)
</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_XMLRPC_wp_getPosts extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPosts( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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"> * @ticket 20991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPosts( array( 1, 'subscriber', 'subscriber' ) );
</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"> $this->assertSame( 401, $result->code );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor' ) );
</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"> $this->assertNotIXRError( $result );
</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">- function test_invalid_post_type() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_type() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = array( 'post_type' => 'invalid_post_type_name' );
</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"> $this->assertIXRError( $result );
</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">- function test_filters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_filters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_name = 'test_wp_getposts_cpt';
</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"> _unregister_post_type( $cpt_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_search() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_search() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids[] = self::factory()->post->create( array( 'post_title' => 'First: Hello, World!' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetProfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getProfile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getProfile.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getProfile.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getProfile extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getProfile( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_subscriber() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_subscriber() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber_id = $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getProfile( array( 1, 'subscriber', 'subscriber' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'subscriber', $result['roles'] );
</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">- function test_administrator() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_administrator() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $administrator_id = $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getProfile( array( 1, 'administrator', 'administrator' ) );
</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"> $this->assertContains( 'administrator', $result['roles'] );
</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">- function test_arbitrary_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_arbitrary_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'email', 'bio', 'user_contacts' );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetRevisionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getRevisions extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'username', 'password', 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</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"> $this->assertNotIXRError( $result );
</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">- function test_revision_count() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,17 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22687
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_revision_count_for_auto_draft_post_creation() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_count_for_auto_draft_post_creation() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->myxmlrpcserver->wp_newPost(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTaxonomiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getTaxonomies extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomies( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_taxonomy_validated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_taxonomy_validated() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomies( array( 1, 'editor', 'editor' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getTaxonomy extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'username', 'password', 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_empty_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'editor', 'editor', '' ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'editor', 'editor', 'not_existing' ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'subscriber', 'subscriber', 'category' ) );
</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->assertSame( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
</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">- function test_taxonomy_validated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_taxonomy_validated() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'editor', 'editor', 'category' ) );
</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"> $this->assertNotIXRError( $result );
</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">- function test_prepare_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_prepare_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'editor', 'editor', 'category' ) );
</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"> * @ticket 51493
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_taxonomy_with_menu_field_specified() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_taxonomy_with_menu_field_specified() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> );
</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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'username', 'password', 'category', 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_empty_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'editor', 'editor', '', 0 ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'editor', 'editor', 'not_existing', 0 ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'subscriber', 'subscriber', 'category', self::$term_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_empty_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'editor', 'editor', 'category', '' ) );
</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"> $this->assertSame( __( 'Empty Term.' ), $result->message );
</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">- function test_invalid_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'editor', 'editor', 'category', 9999 ) );
</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"> $this->assertSame( __( 'Invalid term ID.' ), $result->message );
</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">- function test_valid_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( self::$term_id, 'category', ARRAY_A );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getTerms extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerms( array( 1, 'username', 'password', 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_empty_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', '' ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', 'not_existing' ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getTerms( array( 1, 'subscriber', 'subscriber', 'category' ) );
</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->assertSame( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
</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">- function test_valid_terms() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure there's at least one category.
</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"> }
</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">- function test_custom_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_custom_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a taxonomy and some terms for it.
</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"> unset( $GLOBALS['wp_taxonomies'][ $tax_name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_term_ordering() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_term_ordering() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cat1 = wp_create_category( 'wp.getTerms_' . __FUNCTION__ . '_1' );
</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"> }
</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">- function test_terms_search() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_terms_search() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = __FUNCTION__;
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetUserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> class Tests_XMLRPC_wp_getUser extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $administrator_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a super admin.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,19 +17,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getUser( array( 1, 'username', 'password', 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_invalid_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getUser( array( 1, 'administrator', 'administrator', 34902348908234 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 404, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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->assertSame( 401, $result->code );
</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">- function test_subscriber_self() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_subscriber_self() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber_id = $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getUser( array( 1, 'subscriber', 'subscriber', $subscriber_id ) );
</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"> $this->assertEquals( $subscriber_id, $result['user_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $registered_date = strtotime( '-1 day' );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'getusertestuser',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_no_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getUser( array( 1, 'administrator', 'administrator', $editor_id, array() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_fields, array_keys( $result ) );
</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">- function test_basic_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_basic_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getUser( array( 1, 'administrator', 'administrator', $editor_id, array( 'basic' ) ) );
</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->assertSameSets( $expected_fields, $keys );
</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">- function test_arbitrary_fields() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_arbitrary_fields() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'email', 'bio', 'user_contacts' );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetUsersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getUsers extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'username', 'password' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $results );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $results->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'subscriber', 'subscriber' ) );
</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"> $this->assertSame( 401, $results->code );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator' ) );
</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"> $this->assertIsArray( $result[0]['roles'] );
</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">- function test_invalid_role() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_role() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $administrator_id = $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $administrator_id );
</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"> * @expectedDeprecated WP_User_Query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_role_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_role_filter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $administrator_id = $this->make_user_by_role( 'administrator' );
</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"> $this->assertCount( 3, array_intersect( array( $author_id, $editor_id, $administrator_id ), wp_list_pluck( $results2, 'user_id' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_paging_filters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_paging_filters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $administrator_id = $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $administrator_id );
</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"> $this->assertCount( 0, array_diff( $user_ids, $users_found ) );
</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">- function test_order_filters() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_order_filters() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> );
</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">- function test_valid_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newComment(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</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"> $this->assertNotIXRError( $result );
</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">- function test_empty_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newComment(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</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">- function test_new_comment_post_closed() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_comment_post_closed() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'closed',
</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->assertSame( 403, $result->code );
</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">- function test_new_comment_duplicated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_comment_duplicated() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'administrator',
</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"> * @ticket 51595
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_allowed_anon_comments() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allowed_anon_comments() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xmlrpc_allow_anonymous_comments', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51595
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_anon_comments_require_email() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_anon_comments_require_email() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xmlrpc_allow_anonymous_comments', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51595
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_username_avoids_anon_flow() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_username_avoids_anon_flow() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xmlrpc_allow_anonymous_comments', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected result. True: successfull comment. False: Refused comment.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $anon_callback Optional. Allow anonymous comment callback. Default __return_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">- function test_comments_observe_post_permissions( $post_key, $username, $expected, $anon_callback = '__return_false' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_comments_observe_post_permissions( $post_key, $username, $expected, $anon_callback = '__return_false' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xmlrpc_allow_anonymous_comments', $anon_callback );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string Optional. Allow anonymous comment callback. Default __return_false.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function data_comments_observe_post_permissions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_comments_observe_post_permissions() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 0: Post author, password protected public post.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_newPost extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'username', 'password', array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'subscriber', 'subscriber', array() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,17 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_no_content() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_no_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'author', 'author', array() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,17 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Content, title, and excerpt are empty.', $result->message );
</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">- function test_basic_content() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_basic_content() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array( 'post_title' => 'Test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,17 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result );
</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">- function test_ignore_id() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ignore_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,17 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( '103948', $result );
</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">- function test_capable_publish() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_publish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_publish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,17 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_capable_private() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_private() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_private() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_private() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,17 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_capable_other_author() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_other_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $other_author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_incapable_other_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_other_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $other_author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_invalid_author() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,17 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 404, $result->code );
</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">- function test_empty_author() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_author() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $my_author_id = $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array( 'post_title' => 'Test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_post_thumbnail() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_thumbnail() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,17 +168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_post_status() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_status() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'draft', get_post_status( $result ) );
</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">- function test_incapable_sticky() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_sticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,17 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_capable_sticky() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_sticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_sticky( $result ) );
</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">- function test_private_sticky() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_private_sticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,17 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result->code );
</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">- function test_post_format() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_post_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,17 +229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'quote', get_post_format( $result ) );
</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">- function test_invalid_post_format() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_format() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', get_post_format( $result ) );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 401, $result2->code );
</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">- function test_invalid_term_id() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_term_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,17 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_terms() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 = wp_create_tag( 'tag1' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,17 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $tag3['term_id'], $post_tags );
</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">- function test_terms_names() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_terms_names() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ambiguous_name = 'foo';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,17 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_post_date_does_not_fatal() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_date_does_not_fatal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string = 'invalid_date';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,17 +364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_invalid_post_date_gmt_does_not_fatal() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_post_date_gmt_does_not_fatal() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string = 'invalid_date';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,17 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_string_post_date() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_string_post_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string = '1984-01-11 05:00:00';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,17 +398,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_string_post_date_gmt() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_string_post_date_gmt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string = '1984-01-11 05:00:00';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,17 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_IXR_post_date() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_IXR_post_date() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string = '1984-01-11 05:00:00';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,17 +432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28601
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_valid_IXR_post_date_gmt() {
- if ( PHP_VERSION_ID >= 80100 ) {
- /*
- * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
- * via hooked in filter functions until a more structural solution to the
- * "missing input validation" conundrum has been architected and implemented.
- */
- $this->expectDeprecation();
- $this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_IXR_post_date_gmt() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string = '1984-01-11 05:00:00';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> );
</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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'username', 'password', array() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_empty_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'editor', 'editor', array( 'taxonomy' => '' ) ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_invalid_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'editor', 'editor', array( 'taxonomy' => 'not_existing' ) ) );
</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"> $this->assertSame( __( 'Invalid taxonomy.' ), $result->message );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'subscriber', 'subscriber', array( 'taxonomy' => 'category' ) ) );
</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"> $this->assertSame( __( 'Sorry, you are not allowed to create terms in this taxonomy.' ), $result->message );
</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">- function test_empty_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_empty_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm(
</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"> $this->assertSame( __( 'The term name cannot be empty.' ), $result->message );
</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">- function test_parent_for_nonhierarchical() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_for_nonhierarchical() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( __( 'This taxonomy is not hierarchical.' ), $result->message );
</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">- function test_parent_invalid() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_invalid() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 500, $result->code );
</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">- function test_parent_not_existing() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_parent_not_existing() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,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">- function test_add_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_term() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm(
</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"> $this->assertStringMatchesFormat( '%d', $result );
</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">- function test_add_term_with_parent() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_term_with_parent() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm(
</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->assertStringMatchesFormat( '%d', $result );
</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">- function test_add_term_with_all() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_term_with_all() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwprestoreRevisionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> public $post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> public $revision_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">- function set_up() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_id = self::factory()->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,13 +27,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->revision_id = $revision->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">- function test_invalid_username_password() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_invalid_username_password() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_restoreRevision( array( 1, 'username', 'password', $this->revision_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</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">- function test_incapable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_incapable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_restoreRevision( array( 1, 'subscriber', 'subscriber', $this->revision_id ) );
</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"> $this->assertSame( 401, $result->code );
</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">- function test_capable_user() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_capable_user() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_restoreRevision( array( 1, 'editor', 'editor', $this->revision_id ) );
</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"> $this->assertNotIXRError( $result );
</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">- function test_revision_restored() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_revision_restored() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_restoreRevision( array( 1, 'editor', 'editor', $this->revision_id ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpsetOptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22936
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_set_option_no_escape_strings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_set_option_no_escape_strings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> $string_with_quote = "Mary's Lamb Shop";
</span><span class="cx" style="display: block; padding: 0 10px"> $escaped_string_with_quote = esc_html( $string_with_quote ); // Title is passed through esc_html().
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpuploadFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2021-11-04 13:15:33 UTC (rev 52009)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2021-11-04 15:22:47 UTC (rev 52010)
</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"> parent::tear_down();
</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">- function test_valid_attachment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_valid_attachment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create attachment.
</span></span></pre>
</div>
</div>
</body>
</html>