<!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>[45607] trunk: Coding Standards: Fix the remaining issues in `/tests`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45607">45607</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/45607","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-07-08 00:55:20 +0000 (Mon, 08 Jul 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Fix the remaining issues in `/tests`.
All PHP files in `/tests` now conform to the PHP coding standards, or have exceptions appropriately marked.
Travis now also runs `phpcs` on the `/tests` directory, any future changes to these files must conform entirely to the WordPress PHP coding standards. {U+01F389}
See <a href="https://core.trac.wordpress.org/ticket/47632">#47632</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkphpcsxmldist">trunk/phpcs.xml.dist</a></li>
<li><a href="#trunkphpunitxmldist">trunk/phpunit.xml.dist</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>
<li><a href="#trunktestsphpunitincludesinstallphp">trunk/tests/phpunit/includes/install.php</a></li>
<li><a href="#trunktestsphpunitincludesmockfsphp">trunk/tests/phpunit/includes/mock-fs.php</a></li>
<li><a href="#trunktestsphpunitincludesobjectcachephp">trunk/tests/phpunit/includes/object-cache.php</a></li>
<li><a href="#trunktestsphpunitincludesphpunit6compatphp">trunk/tests/phpunit/includes/phpunit6/compat.php</a></li>
<li><a href="#trunktestsphpunitincludesphpunit7speedtraplistenerphp">trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php</a></li>
<li><a href="#trunktestsphpunitincludesspeedtraplistenerphp">trunk/tests/phpunit/includes/speed-trap-listener.php</a></li>
<li><a href="#trunktestsphpunitincludestracphp">trunk/tests/phpunit/includes/trac.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunitincludeswpprofilerphp">trunk/tests/phpunit/includes/wp-profiler.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesSchemaphp">trunk/tests/phpunit/tests/admin/includesSchema.php</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
<li><a href="#trunktestsphpunittestsajaxCustomizeMenusphp">trunk/tests/phpunit/tests/ajax/CustomizeMenus.php</a></li>
<li><a href="#trunktestsphpunittestsajaxDeleteCommentphp">trunk/tests/phpunit/tests/ajax/DeleteComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxDimCommentphp">trunk/tests/phpunit/tests/ajax/DimComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxEditCommentphp">trunk/tests/phpunit/tests/ajax/EditComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxResponsephp">trunk/tests/phpunit/tests/ajax/Response.php</a></li>
<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>
<li><a href="#trunktestsphpunittestscommentwalkerphp">trunk/tests/phpunit/tests/comment/walker.php</a></li>
<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>
<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>
<li><a href="#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="#trunktestsphpunittestsdatequeryphp">trunk/tests/phpunit/tests/date/query.php</a></li>
<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>
<li><a href="#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="#trunktestsphpunittestsformattingWPSpecialcharsphp">trunk/tests/phpunit/tests/formatting/WPSpecialchars.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsdeprecatedphp">trunk/tests/phpunit/tests/functions/deprecated.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#trunktestsphpunittestsimagebasephp">trunk/tests/phpunit/tests/image/base.php</a></li>
<li><a href="#trunktestsphpunittestsimagesiteIconphp">trunk/tests/phpunit/tests/image/siteIcon.php</a></li>
<li><a href="#trunktestsphpunittestsimportimportphp">trunk/tests/phpunit/tests/import/import.php</a></li>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
<li><a href="#trunktestsphpunittestsl10nloadTextdomainJustInTimephp">trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php</a></li>
<li><a href="#trunktestsphpunittestsl10nlocaleSwitcherphp">trunk/tests/phpunit/tests/l10n/localeSwitcher.php</a></li>
<li><a href="#trunktestsphpunittestsl10nphp">trunk/tests/phpunit/tests/l10n.php</a></li>
<li><a href="#trunktestsphpunittestslinkthemeFilephp">trunk/tests/phpunit/tests/link/themeFile.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestsmetaregisterMetaphp">trunk/tests/phpunit/tests/meta/registerMeta.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetSpaceUsedphp">trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.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="#trunktestsphpunittestsoembedheadersphp">trunk/tests/phpunit/tests/oembed/headers.php</a></li>
<li><a href="#trunktestsphpunittestspomomophp">trunk/tests/phpunit/tests/pomo/mo.php</a></li>
<li><a href="#trunktestsphpunittestspomopluralFormsphp">trunk/tests/phpunit/tests/pomo/pluralForms.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="#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="#trunktestsphpunittestspostwpPostTypephp">trunk/tests/phpunit/tests/post/wpPostType.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestrequestphp">trunk/tests/phpunit/tests/rest-api/rest-request.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>
<li><a href="#trunktestsphpunittestsshortcodephp">trunk/tests/phpunit/tests/shortcode.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="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpTaxonomyphp">trunk/tests/phpunit/tests/term/wpTaxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermwpUpdateTermphp">trunk/tests/phpunit/tests/term/wpUpdateTerm.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="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>
<li><a href="#trunktestsphpunittestswpphp">trunk/tests/phpunit/tests/wp.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPagesphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPages.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</a></li>
<li><a href="#trunktestsphpunitwpmailrealtestphp">trunk/tests/phpunit/wp-mail-real-test.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/.travis.yml 2019-07-08 00:55:20 UTC (rev 45607)
</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"> - php: 7.2
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_TRAVISCI=e2e
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 7.2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- env: WP_TRAVISCI=travis:format
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ env: WP_TRAVISCI=travis:phpcs
</ins><span class="cx" style="display: block; padding: 0 10px"> - php: 7.1
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_TRAVISCI=travis:js
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 7.4snapshot
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,8 +83,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esac
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span><span class="cx" style="display: block; padding: 0 10px"> - |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # We only need to run composer install on the code formatting job.
- if [[ "$WP_TRAVISCI" == "travis:format" ]]; then
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # We only need to run composer install on the PHP coding standards job.
+ if [[ "$WP_TRAVISCI" == "travis:phpcs" ]]; then
</ins><span class="cx" style="display: block; padding: 0 10px"> composer --version
</span><span class="cx" style="display: block; padding: 0 10px"> travis_retry composer install
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span></span></pre></div>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/Gruntfile.js 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1438,10 +1438,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'lint:php', 'Runs the code linter on changed files.', function() {
+ var done = this.async();
+ var flags = this.flags;
+ var args = changedFiles.php;
+ if ( flags.travis ) {
+ args = [ 'tests' ];
+ }
+ args.unshift( 'lint' );
+ grunt.util.spawn( {
+ cmd: 'composer',
+ args: args,
+ opts: { stdio: 'inherit' }
+ }, function( error ) {
+ if ( flags.error && error ) {
+ done( false );
+ } else {
+ done( true );
+ }
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Travis CI tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('travis:js', 'Runs Javascript Travis CI tasks.', [ 'jshint:corejs', 'qunit:compiled' ]);
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('travis:phpunit', 'Runs PHPUnit Travis CI tasks.', [ 'build', 'phpunit' ]);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask('travis:format', 'Runs Code formatting Travis CI tasks.', [ 'format:php:error' ]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask('travis:phpcs', 'Runs PHP Coding Standards Travis CI tasks.', [ 'format:php:error', 'lint:php:travis:error' ]);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Patch task.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.renameTask('patch_wordpress', 'patch');
</span></span></pre></div>
<a id="trunkphpcsxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpcs.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpcs.xml.dist 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/phpcs.xml.dist 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Whitelist test classes for select sniffs. -->
</span><span class="cx" style="display: block; padding: 0 10px"> <rule ref="WordPress.Files.FileName">
</span><span class="cx" style="display: block; padding: 0 10px"> <properties>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <property name="custom_test_class_whitelist" type="array" value="WP_UnitTestCase,WP_Ajax_UnitTestCase,WP_Canonical_UnitTestCase,WP_Test_REST_TestCase,WP_Test_REST_Controller_Testcase,WP_Test_REST_Post_Type_Controller_Testcase,WP_XMLRPC_UnitTestCase"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <property name="custom_test_class_whitelist" type="array">
+ <!-- Test case parent classes -->
+ <element value="WP_UnitTestCase"/>
+ <element value="WP_Ajax_UnitTestCase"/>
+ <element value="WP_Canonical_UnitTestCase"/>
+ <element value="WP_Test_REST_TestCase"/>
+ <element value="WP_Test_REST_Controller_Testcase"/>
+ <element value="WP_Test_REST_Post_Type_Controller_Testcase"/>
+ <element value="WP_XMLRPC_UnitTestCase"/>
+ <element value="WP_Filesystem_UnitTestCase"/>
+ <element value="WP_Image_UnitTestCase"/>
+ <element value="WP_HTTP_UnitTestCase"/>
+ <element value="WP_Tests_Image_Resize_UnitTestCase"/>
+ <element value="WP_Import_UnitTestCase"/>
+ <element value="Tests_Query_Conditionals"/>
+
+ <!-- Mock classes -->
+ <element value="Spy_REST_Server"/>
+ <element value="WP_REST_Test_Controller"/>
+ <element value="WP_Image_Editor_Mock"/>
+ <element value="WP_Filesystem_MockFS"/>
+ <element value="MockPHPMailer"/>
+ <element value="MockAction"/>
+ <element value="WP_Object_Cache"/>
+
+ <!-- PHPUnit helpers -->
+ <element value="TracTickets"/>
+ <element value="WP_PHPUnit_Util_Getopt"/>
+ <element value="PHPUnit_Util_Test"/>
+ <element value="WPProfiler"/>
+ <element value="SpeedTrapListener"/>
+ <element value="PHPUnit_Framework_Exception"/>
+ </property>
</ins><span class="cx" style="display: block; padding: 0 10px"> </properties>
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkphpunitxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpunit.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpunit.xml.dist 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/phpunit.xml.dist 2019-07-08 00:55:20 UTC (rev 45607)
</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"> <listener class="SpeedTrapListener" file="tests/phpunit/includes/listener-loader.php">
</span><span class="cx" style="display: block; padding: 0 10px"> <arguments>
</span><span class="cx" style="display: block; padding: 0 10px"> <array>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <element key="slowThreshold">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <element key="slow_threshold">
</ins><span class="cx" style="display: block; padding: 0 10px"> <integer>150</integer>
</span><span class="cx" style="display: block; padding: 0 10px"> </element>
</span><span class="cx" style="display: block; padding: 0 10px"> </array>
</span></span></pre></div>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/bootstrap.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $_SERVER['PHP_SELF'] = '/index.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should we run in multisite mode?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$multisite = '1' == getenv( 'WP_MULTISITE' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$multisite = ( '1' === getenv( 'WP_MULTISITE' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $multisite = $multisite || ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE );
</span><span class="cx" style="display: block; padding: 0 10px"> $multisite = $multisite || ( defined( 'MULTISITE' ) && MULTISITE );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $skipped_groups as $group_name => $skipped ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group_name, $groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group_name, $groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $skipped_groups[ $group_name ] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/functions.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/functions.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->term_relationships,
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->termmeta,
</span><span class="cx" style="display: block; padding: 0 10px"> ) as $table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DELETE FROM {$table}" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->terms,
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->term_taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) as $table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DELETE FROM {$table} WHERE term_id != 1" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/install.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/install.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,10 +53,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( 'SET foreign_key_checks = 0' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables() as $table => $prefixed_table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We need to create references to ms global tables.
</span></span></pre></div>
<a id="trunktestsphpunitincludesmockfsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/mock-fs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/mock-fs.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/mock-fs.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,12 +61,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $paths as $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow for comments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '#' == $path[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '#' === $path[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Directories
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/' == $path[ strlen( $path ) - 1 ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' === $path[ strlen( $path ) - 1 ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->mkdir( $path );
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // Files (with dummy content for now)
</span><span class="cx" style="display: block; padding: 0 10px"> $this->put_contents( $path, 'This is a test file' );
</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"> function dirlist( $path = '.', $include_hidden = true, $recursive = 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">- if ( empty( $path ) || '.' == $path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $path ) || '.' === $path ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = $this->cwd();
</span><span class="cx" style="display: block; padding: 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,15 +177,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->fs_map[ $path ]->children as $entry ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $entry->name || '..' == $entry->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $entry->name || '..' === $entry->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $include_hidden && '.' == $entry->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $include_hidden && '.' === $entry->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $limit_file && $entry->name != $limit_file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $limit_file && $entry->name !== $limit_file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $struc['name'] = $entry->name;
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['type'] = $entry->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">- if ( 'd' == $struc['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'd' === $struc['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $recursive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,11 +219,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"> function is_file() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->type == 'f';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'f' === $this->type;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function is_dir() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->type == 'd';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'd' === $this->type;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesobjectcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/object-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/object-cache.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/object-cache.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -872,10 +872,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value appended to the $key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $expiration The expiration time, defaults to 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 add( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensuring that wp_suspend_cache_addition is defined before calling, because sometimes an advanced-cache.php
</span><span class="cx" style="display: block; padding: 0 10px"> * file will load object-cache.php before wp-includes/functions.php is loaded. In those cases, if wp_cache_add
</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"> $expiration = $this->sanitize_expiration( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If group is a non-Memcached group, save to runtime cache, not Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add does not set the value if the key exists; mimic that here
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->cache[ $derived_key ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,7 +903,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save to Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->addByKey( $server_key, $derived_key, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->add( $derived_key, $value, $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,10 +991,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Must be string as appending mixed values is not well-defined.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value appended to the $key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 append( $key, $value, $group = 'default', $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function append( $key, $value, $group = 'default', $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $value ) && ! is_int( $value ) && ! is_float( $value ) ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1002,7 +1002,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If group is a non-Memcached group, append to runtime cache value, not Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->cache[ $derived_key ] ) ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1013,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Append to Memcached value
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->appendByKey( $server_key, $derived_key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->append( $derived_key, $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,10 +1064,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value appended to the $key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $expiration The expiration time, defaults to 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 cas( $cas_token, $key, $value, $group = 'default', $expiration = 0, $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function cas( $cas_token, $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = $this->sanitize_expiration( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,13 +1076,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * that since check and set cannot be emulated in the run time cache, this value
</span><span class="cx" style="display: block; padding: 0 10px"> * operation is treated as a normal "add" for no_mc_groups.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->add_to_internal_cache( $derived_key, $value );
</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="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save to Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->casByKey( $cas_token, $server_key, $derived_key, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->cas( $cas_token, $derived_key, $value, $expiration );
</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"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Decrement values in no_mc_groups
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only decrement if the key already exists and value is 0 or greater (mimics memcached behavior)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->cache[ $derived_key ] ) && $this->cache[ $derived_key ] >= 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1191,14 +1191,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value appended to the $key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $time The amount of time the server will wait to delete the item in seconds.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 delete( $key, $group = 'default', $time = 0, $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function delete( $key, $group = 'default', $time = 0, $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove from no_mc_groups array
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->cache[ $derived_key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->cache[ $derived_key ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1206,7 +1206,7 @@
</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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->deleteByKey( $server_key, $derived_key, $time );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->delete( $derived_key, $time );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1299,12 +1299,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $force Whether or not to force a cache invalidation.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param null|bool $found Variable passed by reference to determine if the value was found or not.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param null|callable $cache_cb Read-through caching callback.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param null|float $cas_token The variable to store the CAS token in.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|mixed Cached object 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">- public function get( $key, $group = 'default', $force = false, &$found = null, $server_key = '', $byKey = false, $cache_cb = null, &$cas_token = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get( $key, $group = 'default', $force = false, &$found = null, $server_key = '', $by_key = false, $cache_cb = null, &$cas_token = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Assume object is not found
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1311,8 +1311,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If either $cache_db, or $cas_token is set, must hit Memcached and bypass runtime cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( func_num_args() > 6 && ! in_array( $group, $this->no_mc_groups ) ) {
- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( func_num_args() > 6 && ! in_array( $group, $this->no_mc_groups, true ) ) {
+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $this->m->getByKey( $server_key, $derived_key, $cache_cb, $cas_token );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->m->get( $derived_key, $cache_cb, $cas_token );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,10 +1321,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->cache[ $derived_key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = true;
</span><span class="cx" style="display: block; padding: 0 10px"> return is_object( $this->cache[ $derived_key ] ) ? clone $this->cache[ $derived_key ] : $this->cache[ $derived_key ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $this->m->getByKey( $server_key, $derived_key );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->m->get( $derived_key );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1464,7 +1464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If order should be preserved, reorder now
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $need_to_get ) && $flags === Memcached::GET_PRESERVE_ORDER ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $need_to_get ) && Memcached::GET_PRESERVE_ORDER === $flags ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ordered_values = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $derived_keys as $key ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1603,7 +1603,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Increment values in no_mc_groups
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only increment if the key already exists and the number is currently 0 or greater (mimics memcached behavior)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->cache[ $derived_key ] ) && $this->cache[ $derived_key ] >= 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1668,10 +1668,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Must be string as prepending mixed values is not well-defined.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value prepended to the $key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 prepend( $key, $value, $group = 'default', $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function prepend( $key, $value, $group = 'default', $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $value ) && ! is_int( $value ) && ! is_float( $value ) ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1679,7 +1679,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If group is a non-Memcached group, prepend to runtime cache value, not Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->cache[ $derived_key ] ) ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1690,7 +1690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Append to Memcached value
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->prependByKey( $server_key, $derived_key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->prepend( $derived_key, $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1740,16 +1740,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key The key under which to store the value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to store.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value appended to the $key.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $expiration The expiration time, defaults to 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 replace( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function replace( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = $this->sanitize_expiration( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If group is a non-Memcached group, save to runtime cache, not Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace won't save unless the key already exists; mimic this behavior here
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->cache[ $derived_key ] ) ) {
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save to Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->replaceByKey( $server_key, $derived_key, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->replace( $derived_key, $value, $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1806,21 +1806,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group The group value appended to the $key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $expiration The expiration time, defaults to 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $derived_key = $this->buildKey( $key, $group );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = $this->sanitize_expiration( $expiration );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If group is a non-Memcached group, save to runtime cache, not Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->add_to_internal_cache( $derived_key, $value );
</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="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save to Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->setByKey( $server_key, $derived_key, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->set( $derived_key, $value, $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1867,10 +1867,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $groups Group(s) to merge with key(s) in $items.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $expiration The expiration time, defaults to 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $server_key The key identifying the server to store the value on.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $byKey True to store in internal cache by key; false to not store by key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $by_key True to store in internal cache by key; false to not store by key
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns TRUE on success or FALSE on failure.
</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 setMulti( $items, $groups = 'default', $expiration = 0, $server_key = '', $byKey = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function setMulti( $items, $groups = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Build final keys and replace $items keys with the new keys
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_keys = $this->buildKeys( array_keys( $items ), $groups );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = $this->sanitize_expiration( $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1883,7 +1883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key_pieces = explode( ':', $derived_key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If group is a non-Memcached group, save to runtime cache, not Memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $key_pieces[1], $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $key_pieces[1], $this->no_mc_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->add_to_internal_cache( $derived_key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $derived_items[ $derived_key ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1890,7 +1890,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save to memcached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $byKey ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $by_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->setMultiByKey( $server_key, $derived_items, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->m->setMulti( $derived_items, $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1953,7 +1953,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $group = '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">- if ( false !== array_search( $group, $this->global_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== array_search( $group, $this->global_groups, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $prefix = $this->global_prefix;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $this->blog_prefix;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1991,7 +1991,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we have equal numbers of keys and groups, merge $keys[n] and $group[n]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $keys ) == count( $groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $keys ) === count( $groups ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < count( $keys ); $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_keys[] = $this->buildKey( $keys[ $i ], $groups[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2001,7 +2001,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < count( $keys ); $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $groups[ $i ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_keys[] = $this->buildKey( $keys[ $i ], $groups[ $i ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( count( $groups ) == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( count( $groups ) === 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $derived_keys[] = $this->buildKey( $keys[ $i ], $groups[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $derived_keys[] = $this->buildKey( $keys[ $i ], 'default' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2046,7 +2046,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = gettype( $original );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Combine the values based on direction of the "pend"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'pre' == $direction ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'pre' === $direction ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $combined = $pended . $original;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $combined = $original . $pended;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2080,7 +2080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function contains_no_mc_group( $groups ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_scalar( $groups ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $groups, $this->no_mc_groups );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $groups, $this->no_mc_groups, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $groups ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2088,7 +2088,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $groups as $group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, $this->no_mc_groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, $this->no_mc_groups, true ) ) {
</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></span></pre></div>
<a id="trunktestsphpunitincludesphpunit6compatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/phpunit6/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/phpunit6/compat.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/phpunit6/compat.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +18,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class PHPUnit_Util_Test {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function getTickets( $className, $methodName ) {
- $annotations = PHPUnit\Util\Test::parseTestMethodAnnotations( $className, $methodName );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function getTickets( $class_name, $method_name ) {
+ $annotations = PHPUnit\Util\Test::parseTestMethodAnnotations( $class_name, $method_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tickets = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesphpunit7speedtraplistenerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $slowThreshold;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $slow_threshold;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Number of tests to report on for slowness.
</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"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $reportLength;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $report_length;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Collection of slow tests.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,11 +166,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether the given test execution time is considered slow.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $time Test execution time in milliseconds
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $slowThreshold Test execution time at which a test should be considered slow (milliseconds)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $slow_threshold Test execution time at which a test should be considered slow (milliseconds)
</ins><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">- protected function isSlow( $time, $slowThreshold ) {
- return $time >= $slowThreshold;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function isSlow( $time, $slow_threshold ) {
+ return $time >= $slow_threshold;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function getReportLength() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return min( count( $this->slow ), $this->reportLength );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return min( count( $this->slow ), $this->report_length );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</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"> * Renders slow test report header.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function renderHeader() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo sprintf( "\n\nYou should really fix these slow tests (>%sms)...\n", $this->slowThreshold );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo sprintf( "\n\nYou should really fix these slow tests (>%sms)...\n", $this->slow_threshold );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 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,12 +251,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Renders slow test report body.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function renderBody() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slowTests = $this->slow;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slow_tests = $this->slow;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $length = $this->getReportLength( $slowTests );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $length = $this->getReportLength( $slow_tests );
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= $length; ++$i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $label = key( $slowTests );
- $time = array_shift( $slowTests );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $label = key( $slow_tests );
+ $time = array_shift( $slow_tests );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo sprintf( " %s. %sms to run %s\n", $i, $time, $label );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function renderFooter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = $this->getHiddenCount( $this->slow );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $hidden ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo sprintf( '...and there %s %s more above your threshold hidden from view', $hidden == 1 ? 'is' : 'are', $hidden );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo sprintf( '...and there %s %s more above your threshold hidden from view', 1 === $hidden ? 'is' : 'are', $hidden );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 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,8 +278,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $options
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function loadOptions( array $options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->slowThreshold = isset( $options['slowThreshold'] ) ? $options['slowThreshold'] : 500;
- $this->reportLength = isset( $options['reportLength'] ) ? $options['reportLength'] : 10;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->slow_threshold = isset( $options['slowThreshold'] ) ? $options['slowThreshold'] : 500;
+ $this->report_length = isset( $options['reportLength'] ) ? $options['reportLength'] : 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="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,6 +302,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function getSlowThreshold( PHPUnit_Framework_TestCase $test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ann = $test->getAnnotations();
</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 isset( $ann['method']['slowThreshold'][0] ) ? $ann['method']['slowThreshold'][0] : $this->slowThreshold;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return isset( $ann['method']['slowThreshold'][0] ) ? $ann['method']['slowThreshold'][0] : $this->slow_threshold;
</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="trunktestsphpunitincludesspeedtraplistenerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/speed-trap-listener.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/speed-trap-listener.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/speed-trap-listener.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $slowThreshold;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $slow_threshold;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Number of tests to report on for slowness.
</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"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $reportLength;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $report_length;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Collection of slow tests.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,11 +166,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether the given test execution time is considered slow.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $time Test execution time in milliseconds
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $slowThreshold Test execution time at which a test should be considered slow (milliseconds)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $slow_threshold Test execution time at which a test should be considered slow (milliseconds)
</ins><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">- protected function isSlow( $time, $slowThreshold ) {
- return $time >= $slowThreshold;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function isSlow( $time, $slow_threshold ) {
+ return $time >= $slow_threshold;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function getReportLength() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return min( count( $this->slow ), $this->reportLength );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return min( count( $this->slow ), $this->report_length );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</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"> * Renders slow test report header.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function renderHeader() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo sprintf( "\n\nYou should really fix these slow tests (>%sms)...\n", $this->slowThreshold );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo sprintf( "\n\nYou should really fix these slow tests (>%sms)...\n", $this->slow_threshold );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 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,12 +251,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Renders slow test report body.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function renderBody() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slowTests = $this->slow;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slow_tests = $this->slow;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $length = $this->getReportLength( $slowTests );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $length = $this->getReportLength( $slow_tests );
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= $length; ++$i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $label = key( $slowTests );
- $time = array_shift( $slowTests );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $label = key( $slow_tests );
+ $time = array_shift( $slow_tests );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo sprintf( " %s. %sms to run %s\n", $i, $time, $label );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> protected function renderFooter() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $hidden = $this->getHiddenCount( $this->slow ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo sprintf( '...and there %s %s more above your threshold hidden from view', $hidden == 1 ? 'is' : 'are', $hidden );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo sprintf( '...and there %s %s more above your threshold hidden from view', 1 === $hidden ? 'is' : 'are', $hidden );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,8 +277,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $options
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function loadOptions( array $options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->slowThreshold = isset( $options['slowThreshold'] ) ? $options['slowThreshold'] : 500;
- $this->reportLength = isset( $options['reportLength'] ) ? $options['reportLength'] : 10;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->slow_threshold = isset( $options['slowThreshold'] ) ? $options['slowThreshold'] : 500;
+ $this->report_length = isset( $options['reportLength'] ) ? $options['reportLength'] : 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="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,6 +301,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function getSlowThreshold( PHPUnit_Framework_TestCase $test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ann = $test->getAnnotations();
</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 isset( $ann['method']['slowThreshold'][0] ) ? $ann['method']['slowThreshold'][0] : $this->slowThreshold;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return isset( $ann['method']['slowThreshold'][0] ) ? $ann['method']['slowThreshold'][0] : $this->slow_threshold;
</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="trunktestsphpunitincludestracphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/trac.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/trac.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/trac.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> self::$trac_ticket_cache[ $trac_url ] = $tickets;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ! in_array( $ticket_id, self::$trac_ticket_cache[ $trac_url ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ! in_array( $ticket_id, self::$trac_ticket_cache[ $trac_url ], true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/utils.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/utils.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> if ( $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->events as $e ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $e['action'] == $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $e['action'] === $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$count;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,8 +222,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"> function data_handler( $parser, $data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index = count( $this->data ) - 1;
- @$this->data[ $index ]['content'] .= $data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index = count( $this->data ) - 1;
+
+ if ( ! isset( $this->data[ $index ]['content'] ) ) {
+ $this->data[ $index ]['content'] = '';
+ }
+ $this->data[ $index ]['content'] .= $data;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function end_handler( $parser, $name ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,9 +257,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < count( $tree ); $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> # echo "checking '{$tree[$i][name]}' == '{$a[0]}'\n";
</span><span class="cx" style="display: block; padding: 0 10px"> # var_dump($tree[$i]['name'], $a[0]);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $tree[ $i ]['name'] == $a[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $tree[ $i ]['name'] === $a[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> # echo "n == {$n}\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $n == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $n ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out[] = $tree[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subtree =& $tree[ $i ]['child'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,6 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $tables = $wpdb->get_col( 'SHOW TABLES;' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tables as $table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$table}" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Special class for exposing protected wpdb methods we need to access
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class wpdb_exposed_methods_for_testing extends wpdb {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WpdbExposedMethodsForTesting extends wpdb {
</ins><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->dbh = $wpdb->dbh;
</span></span></pre></div>
<a id="trunktestsphpunitincludeswpprofilerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/wp-profiler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/wp-profiler.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/includes/wp-profiler.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,10 +114,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function log_filter( $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->stack ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_actions;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $tag == end( $wp_actions ) ) {
- @$this->stack[ count( $this->stack ) - 1 ]['actions'][ $tag ] ++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( end( $wp_actions ) === $tag ) {
+ $this->stack[ count( $this->stack ) - 1 ]['actions'][ $tag ]++;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @$this->stack[ count( $this->stack ) - 1 ]['filters'][ $tag ] ++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->stack[ count( $this->stack ) - 1 ]['filters'][ $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"> return $arg;
</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"> public function log_action( $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->stack ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @$this->stack[ count( $this->stack ) - 1 ]['actions'][ $tag ] ++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->stack[ count( $this->stack ) - 1 ]['actions'][ $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">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = preg_replace( '/(WHERE \w+ =) \d+/', '$1 x', $sql );
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = preg_replace( '/(WHERE \w+ =) \'\[-\w]+\'/', '$1 \'xxx\'', $sql );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @$out[ $sql ] ++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out[ $sql ] ++;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> asort( $out );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,9 +155,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $out = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $queries as $q ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $q[2] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @$out['unknown'] ++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out['unknown']++;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @$out[ $q[2] ] ++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out[ $q[2] ]++;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,8 +102,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = $this->_create_plugin( null, 'list_files_test_plugin.php', $plugin_dir );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sub_dir = trailingslashit( dirname( $plugin[1] ) ) . 'subdir';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @mkdir( $sub_dir );
- @file_put_contents( $sub_dir . '/subfile.php', '<?php // Silence.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( $sub_dir );
+ file_put_contents( $sub_dir . '/subfile.php', '<?php // Silence.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_files = get_plugin_files( plugin_basename( $plugin[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</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">- @closedir( $mu_plugins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ closedir( $mu_plugins );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $files_to_move as $file_to_move ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $f = rename( WPMU_PLUGIN_DIR . '/' . $file_to_move, $mu_bu_dir . '/' . $file_to_move );
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @closedir( $mu_plugins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ closedir( $mu_plugins );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $files_to_move as $file_to_move ) {
</span><span class="cx" style="display: block; padding: 0 10px"> rename( $mu_bu_dir . '/' . $file_to_move, WPMU_PLUGIN_DIR . '/' . $file_to_move );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/admin/includesSchema.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $charset_collate = $wpdb->get_charset_collate();
</span><span class="cx" style="display: block; padding: 0 10px"> $max_index_length = 191;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$options} (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,6 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {$charset_collate}
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:enable
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,9 +80,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blogmeta = self::$blogmeta;
</span><span class="cx" style="display: block; padding: 0 10px"> $sitemeta = self::$sitemeta;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$options}" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$blogmeta}" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$sitemeta}" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:enable
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/adminbar.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,7 +744,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $nodes = $wp_admin_bar->get_nodes();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $cap, $network_user_caps ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $cap, $network_user_caps, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $nodes[ $id ] ), sprintf( 'Menu item %1$s must display for a user with the %2$s cap.', $id, $cap ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $nodes[ $id ] ), sprintf( 'Menu item %1$s must not display for a user without the %2$s cap.', $id, $cap ) );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> function test_ajax_load_available_items_cap_check( $role, $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">- if ( 'administrator' != $role ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'administrator' !== $role ) {
</ins><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="cx" style="display: block; padding: 0 10px"> $this->setExpectedException( 'WPAjaxDieStopException' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ajax_search_available_items_caps_check( $role, $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">- if ( 'administrator' != $role ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'administrator' !== $role ) {
</ins><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="cx" style="display: block; padding: 0 10px"> $this->setExpectedException( 'WPAjaxDieStopException' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxDeleteCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/ajax/DeleteComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DeleteComment.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/ajax/DeleteComment.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,11 +94,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertLessThanOrEqual( time(), (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // trash, spam, delete should make the total go down
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $action, array( 'trash', 'spam', 'delete' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $action, array( 'trash', 'spam', 'delete' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $total = $_POST['_total'] - 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // unspam, untrash should make the total go up
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $action, array( 'untrash', 'unspam' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $action, array( 'untrash', 'unspam' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $total = $_POST['_total'] + 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">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for either possible total
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( 'returned value: %1$d $total: %2$d $recalc_total: %3$d', (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], $total, $recalc_total );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ) ), $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ), true ), $message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</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"> $this->_last_response = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Force delete the comment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'delete' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'delete' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_delete_comment( $comment->comment_ID, 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="trunktestsphpunittestsajaxDimCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/ajax/DimComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DimComment.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/ajax/DimComment.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> // Check the status
</span><span class="cx" style="display: block; padding: 0 10px"> $current = wp_get_comment_status( $comment->comment_ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $prev_status, array( 'unapproved', 'spam' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $prev_status, array( 'unapproved', 'spam' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'approved', $current );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'unapproved', $current );
</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"> $total = $_POST['_total'] - 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for either possible total
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ), true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/ajax/EditComment.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $comment = array_pop( $comments );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Manually update the comment_post_ID, because wp_update_comment() will prevent it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->query( "UPDATE {$wpdb->comments} SET comment_post_ID=0 WHERE comment_ID={$comment->comment_ID}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->update( $wpdb->comments, array( 'comment_post_ID' => 0 ), array( 'comment_ID' => $comment->comment_ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> clean_comment_cache( $comment->comment_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up a default request
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxResponsephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/ajax/Response.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Response.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/ajax/Response.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $headers = xdebug_get_headers();
</span><span class="cx" style="display: block; padding: 0 10px"> ob_end_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), $headers ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), $headers, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/basic.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $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="cx" style="display: block; padding: 0 10px"> // package.json uses x.y.z, so fill cleaned $wp_version for .0 releases
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == substr_count( $version, '.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === substr_count( $version, '.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $version .= '.0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $version, $package_json['version'], "package.json's version needs to be updated to $version." );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/comment/walker.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,10 +54,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"> public function comment( $comment, $args, $depth ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == $depth ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $depth ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->test_walker->assertTrue( $this->walker->has_children );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->test_walker->assertTrue( $args['has_children'] ); // Back compat
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 2 == $depth ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 2 === $depth ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->test_walker->assertFalse( $this->walker->has_children );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->test_walker->assertFalse( $args['has_children'] ); // Back compat
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/comment.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> // Check to see if a notification email was sent to the moderator `admin@example.org`.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['phpmailer']->mock_sent )
</span><span class="cx" style="display: block; padding: 0 10px"> && ! empty( $GLOBALS['phpmailer']->mock_sent )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && WP_TESTS_EMAIL === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $email_sent_when_comment_added = true;
</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">@@ -700,7 +700,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if a notification email was sent to the post author `test@test.com`.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['phpmailer']->mock_sent )
</span><span class="cx" style="display: block; padding: 0 10px"> && ! empty( $GLOBALS['phpmailer']->mock_sent )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && 'test@test.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && 'test@test.com' === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $email_sent_when_comment_approved = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> // Check to see if a notification email was sent to the post author `test@test.com`.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['phpmailer']->mock_sent ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $GLOBALS['phpmailer']->mock_sent ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test@test.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test@test.com' === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_sent_when_comment_added = true;
</span><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunktestsphpunittestscompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/compat.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> $heredoc,
</span><span class="cx" style="display: block; padding: 0 10px"> // object data
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new classA(),
- // undefined data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new ClassA(),
+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- intentionally undefined data
</ins><span class="cx" style="display: block; padding: 0 10px"> @$undefined_var,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // unset data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- intentionally unset data
</ins><span class="cx" style="display: block; padding: 0 10px"> @$unset_var,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $outputs = array(
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> /* used in test_mb_substr_phpcore */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class classA {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class ClassA {
</ins><span class="cx" style="display: block; padding: 0 10px"> public function __toString() {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'Class A object';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/customize/manager.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2668,7 +2668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_dynamic_setting_args_for_test_dynamic_settings( $setting_args, $setting_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'string', $setting_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $setting_id, array( 'foo', 'bar' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $setting_id, array( 'foo', 'bar' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting_args = array( 'default' => "dynamic_{$setting_id}_default" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $setting_args;
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $menu_items = wp_get_nav_menu_items( $secondary_menu_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $db_ids = wp_list_pluck( $menu_items, 'db_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $item_id, $db_ids );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = array_search( $item_id, $db_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i = array_search( $item_id, $db_ids, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $updated_item = $menu_items[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value['post_status'] = $post_value['status'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $post_value['status'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +676,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items = wp_get_nav_menu_items( $secondary_menu_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $db_ids = wp_list_pluck( $menu_items, 'db_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $item_id, $db_ids );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = array_search( $item_id, $db_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i = array_search( $item_id, $db_ids, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $updated_item = $menu_items[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value['post_status'] = $post_value['status'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $post_value['status'] );
</span></span></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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $menus = wp_get_nav_menus();
</span><span class="cx" style="display: block; padding: 0 10px"> $menus_ids = wp_list_pluck( $menus, 'term_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = array_search( $menu_id, $menus_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i = array_search( $menu_id, $menus_ids, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $i, 'Update-previewed menu does not appear in wp_get_nav_menus()' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_menu = $menus[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Name 2 \\o/', $filtered_menu->name );
</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"> $menus = wp_get_nav_menus();
</span><span class="cx" style="display: block; padding: 0 10px"> $menus_ids = wp_list_pluck( $menus, 'term_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = array_search( $menu_id, $menus_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i = array_search( $menu_id, $menus_ids, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_menu = $menus[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'New Menu Name 1 \\o/', $filtered_menu->name );
</span></span></pre></div>
<a id="trunktestsphpunittestsdatequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/date/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/query.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/date/query.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1014,7 +1014,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Invalid values.
</span><span class="cx" style="display: block; padding: 0 10px"> $days_of_year = array( -1, 0, 367 );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $days_of_year as $day_of_year ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( @$this->q->validate_date_values( array( 'dayofyear' => $day_of_year ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->q->validate_date_values( array( 'dayofyear' => $day_of_year ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdbcharsetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/db/charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/db/charset.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> require_once( dirname( dirname( __FILE__ ) ) . '/db.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">- self::$_wpdb = new wpdb_exposed_methods_for_testing();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$_wpdb = new WpdbExposedMethodsForTesting();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self::$_wpdb->use_mysqli ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$server_info = mysqli_get_server_info( self::$_wpdb->dbh );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/db.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> public static function setUpBeforeClass() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUpBeforeClass();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$_wpdb = new wpdb_exposed_methods_for_testing();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$_wpdb = new WpdbExposedMethodsForTesting();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_allowed_incompatible_sql_mode( $modes ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pos = array_search( 'ONLY_FULL_GROUP_BY', $modes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = array_search( 'ONLY_FULL_GROUP_BY', $modes, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThanOrEqual( 0, $pos );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $pos ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,6 +365,7 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = $id", $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0", $prepared );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,9 +383,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_prepare_sprintf_invalid_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", 1, array( 'admin' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><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="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "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="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,9 +405,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_prepare_vsprintf_invalid_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1, array( 'admin' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( array( 1 ), 'admin' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "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="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,6 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // $query is the first argument to be passed to wpdb::prepare()
</span><span class="cx" style="display: block; padding: 0 10px"> array_unshift( $args, $query );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared = @call_user_func_array( array( $wpdb, 'prepare' ), $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $prepared );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,6 +593,7 @@
</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="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->get_col( $query, $column );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $query ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,7 +1050,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_charset = $wpdb->get_col_charset( $wpdb->posts, '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">- if ( ! in_array( $expected_charset, array( 'utf8', 'utf8mb4', 'latin1' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $expected_charset, array( 'utf8', 'utf8mb4', 'latin1' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test only works with utf8, utf8mb4 or latin1 character sets' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,7 +1123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $row->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,7 +1146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $value, $row->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1154,7 +1161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $row->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,7 +1184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $row->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1192,7 +1199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $value, $row->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1215,7 +1222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $row->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1228,7 +1235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%s', '%s' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $row );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1572,6 +1579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = str_replace( '{ESCAPE}', $escape, $sql );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = $wpdb->prepare( $sql, $values );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1653,6 +1661,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "CREATE TABLE {$wpdb->prefix}test_placeholder( a VARCHAR(100) );" );
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare( "INSERT INTO {$wpdb->prefix}test_placeholder VALUES(%s)", $value );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $sql );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = $wpdb->get_var( "SELECT a FROM {$wpdb->prefix}test_placeholder" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1667,6 +1677,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare( ' %s %1$c ', 'foo' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare( " $sql %s ", 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( " 'foo' {$wpdb->placeholder_escape()}1\$c 'foo' ", $sql );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/dbdelta.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,18 +33,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Forcing MyISAM, because InnoDB only started supporting FULLTEXT indexes in MySQL 5.7.
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- CREATE TABLE {$wpdb->prefix}dbdelta_test (
- id bigint(20) NOT NULL AUTO_INCREMENT,
- column_1 varchar(255) NOT NULL,
- column_2 text,
- column_3 blob,
- PRIMARY KEY (id),
- KEY key_1 (column_1($this->max_index_length)),
- KEY compound_key (id,column_1($this->max_index_length)),
- FULLTEXT KEY fulltext_key (column_1)
- ) ENGINE=MyISAM
- "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->prepare(
+ "
+ CREATE TABLE {$wpdb->prefix}dbdelta_test (
+ id bigint(20) NOT NULL AUTO_INCREMENT,
+ column_1 varchar(255) NOT NULL,
+ column_2 text,
+ column_3 blob,
+ PRIMARY KEY (id),
+ KEY key_1 (column_1(%d)),
+ KEY compound_key (id,column_1(%d)),
+ FULLTEXT KEY fulltext_key (column_1)
+ ) ENGINE=MyISAM
+ ",
+ $this->max_index_length,
+ $this->max_index_length
+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,6 +303,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function assertTableRowHasValue( $column, $value, $table ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_row = $wpdb->get_row( "select $column from {$table} where $column = '$value'" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +322,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function assertTableHasColumn( $column, $table ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $table_fields = $wpdb->get_results( "DESCRIBE {$table}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+ $table_fields = $wpdb->get_results( "DESCRIBE $table" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, wp_list_filter( $table_fields, array( 'Field' => $column ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +339,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function assertTableHasPrimaryKey( $column, $table ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $table_indices = $wpdb->get_results( "SHOW INDEX FROM {$table}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+ $table_indices = $wpdb->get_results( "SHOW INDEX FROM $table" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount(
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +365,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $table_fields = $wpdb->get_results( "DESCRIBE {$table}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+ $table_fields = $wpdb->get_results( "DESCRIBE $table" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 0, wp_list_filter( $table_fields, array( 'Field' => $column ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,15 +393,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY a_key (a)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $create );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $index = $wpdb->get_row( "SHOW INDEXES FROM $table_name WHERE Key_name='a_key';" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = dbDelta( $create, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS $table_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">- if ( 191 != $index->Sub_part ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 191 !== $index->Sub_part ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test requires the index to be truncated.' );
</span><span class="cx" style="display: block; padding: 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,6 +538,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $schema );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta( $schema, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,6 +568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM;
</span><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $schema );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta( $schema, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,6 +615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $schema );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta( $schema );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,6 +1012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $schema );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $schema_update = "
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/external-http/basic.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> preg_match( '#Recommendations.*PHP</a> version <strong>([0-9.]*)#s', $readme, $matches );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( 'https://secure.php.net/supported-versions.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'Could not contact PHP.net to check versions.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $php = wp_remote_retrieve_body( $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#Recommendations.*MySQL</a> version <strong>([0-9.]*)#s', $readme, $matches );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( "https://dev.mysql.com/doc/relnotes/mysql/{$matches[1]}/en/" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'Could not contact dev.MySQL.com to check versions.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $mysql = wp_remote_retrieve_body( $response );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/feed/atom.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,6 +71,7 @@
</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="cx" style="display: block; padding: 0 10px"> try {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> @require( ABSPATH . 'wp-includes/feed-atom.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $out = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( Exception $e ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Link rel="alternate"
</span><span class="cx" style="display: block; padding: 0 10px"> $link_alts = xml_find( $entries[ $key ]['child'], 'link' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $link_alts as $link_alt ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'alternate' == $link_alt['attributes']['rel'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'alternate' === $link_alt['attributes']['rel'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_permalink( $post ), $link_alt['attributes']['href'] );
</span><span class="cx" style="display: block; padding: 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 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = xml_find( $entries[ $key ]['child'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $categories as $category ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $category['attributes']['term'], $terms ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $category['attributes']['term'], $terms, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $terms );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Link rel="replies"
</span><span class="cx" style="display: block; padding: 0 10px"> $link_replies = xml_find( $entries[ $key ]['child'], 'link' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $link_replies as $link_reply ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'replies' == $link_reply['attributes']['rel'] && 'application/atom+xml' == $link_reply['attributes']['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'replies' === $link_reply['attributes']['rel'] && 'application/atom+xml' === $link_reply['attributes']['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_post_comments_feed_link( $post->ID, 'atom' ), $link_reply['attributes']['href'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedrss2php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/feed/rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,6 +83,7 @@
</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="cx" style="display: block; padding: 0 10px"> try {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> @require( ABSPATH . 'wp-includes/feed-rss2.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $out = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( Exception $e ) {
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/file.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $this->assertLessThan( 10, $time_taken, 'verify_file_signature() took longer than 10 seconds.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if the system parameters prevent signature verifications.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $verify ) && 'signature_verification_unsupported' == $verify->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $verify ) && 'signature_verification_unsupported' === $verify->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This system does not support Signature Verification.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $verify = verify_file_signature( $file, $expected_signature, 'WordPress' );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $verify ) && 'signature_verification_unsupported' == $verify->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $verify ) && 'signature_verification_unsupported' === $verify->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This system does not support Signature Verification.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPSpecialcharsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/WPSpecialchars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPSpecialchars.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/formatting/WPSpecialchars.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> // Allowed entities should be unchanged
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $allowedentitynames as $ent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'apos' == $ent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'apos' === $ent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // But for some reason, PHP doesn't allow '
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1576,7 +1576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case '‘':
</span><span class="cx" style="display: block; padding: 0 10px"> return '!openq1!';
</span><span class="cx" style="display: block; padding: 0 10px"> case '’':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'apostrophe' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'apostrophe' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '!apos!';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return '!closeq1!';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2001,7 +2001,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case '‘':
</span><span class="cx" style="display: block; padding: 0 10px"> return '!q1!';
</span><span class="cx" style="display: block; padding: 0 10px"> case '’':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'apostrophe' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'apostrophe' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '!apos!';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return '!q1!';
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsdeprecatedphp"></a>
<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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/deprecated.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/functions/deprecated.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $key = 'file';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $search as $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $name == $v[ $key ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $name === $v[ $key ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $v;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/functions.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,7 +844,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'EUC-JP', $charsets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'EUC-JP', $charsets, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $charsets[] = 'EUC-JP';
</span><span class="cx" style="display: block; padding: 0 10px"> mb_detect_order( $charsets );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> $charsets = mb_detect_order();
</span><span class="cx" style="display: block; padding: 0 10px"> $old_charsets = $charsets;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'EUC-JP', $charsets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'EUC-JP', $charsets, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $charsets[] = 'EUC-JP';
</span><span class="cx" style="display: block; padding: 0 10px"> mb_detect_order( $charsets );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,8 +965,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_ext2type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $extensions = wp_get_ext_types();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $extensions as $type => $extensionList ) {
- foreach ( $extensionList as $extension ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $extensions as $type => $extension_list ) {
+ foreach ( $extension_list as $extension ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $type, wp_ext2type( $extension ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $type, wp_ext2type( strtoupper( $extension ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestshttpbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/http/base.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> // Disable all transports aside from this one.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'curl', 'streams', 'fsockopen' ) as $t ) {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( "use_{$t}_transport", '__return_false' ); // Just strip them all
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $t != $this->transport ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $t !== $this->transport ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( "use_{$t}_transport", '__return_false' ); // and add it back if need be..
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $headers[ $parts[0] ] = $parts[1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( isset( $headers['test1'] ) && 'test' == $headers['test1'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( isset( $headers['test1'] ) && 'test' === $headers['test1'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $headers['test2'] ) && '0' === $headers['test2'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // cURL/HTTP Extension Note: Will never pass, cURL does not pass headers with an empty value.
</span><span class="cx" style="display: block; padding: 0 10px"> // Should it be that empty headers with empty values are NOT sent?
</span></span></pre></div>
<a id="trunktestsphpunittestsimagebasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/base.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/image/base.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> protected function assertImageDimensions( $filename, $width, $height ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $detected_width = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $detected_height = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_size = @getimagesize( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_size = getimagesize( $filename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $image_size[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $detected_width = $image_size[0];
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/image/siteIcon.php 2019-07-08 00:55:20 UTC (rev 45607)
</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->assertEquals( $sizes, $image_sizes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove custom size.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes ) ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes, true ) ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove the filter we added
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'site_icon_image_sizes', array( $this, '_custom_test_sizes' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> $this->assertEquals( $sizes, $image_sizes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove custom size.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes ) ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $this->wp_site_icon->site_icon_sizes[ array_search( 321, $this->wp_site_icon->site_icon_sizes, true ) ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_create_attachment_object() {
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/import/import.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> // crude but effective: make sure there's no residual data in the main tables
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'posts', 'postmeta', 'comments', 'terms', 'term_taxonomy', 'term_relationships', 'users', 'usermeta' ) as $table ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DELETE FROM {$wpdb->$table}" );
</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="trunktestsphpunittestsksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/kses.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> foreach ( $bad as $k => $x ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_kses_bad_protocol( wp_kses_normalize_entities( $x ), wp_allowed_protocols() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $result ) && $result != 'alert(1);' && $result != 'alert(1)' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $result ) && 'alert(1);' !== $result && 'alert(1)' !== $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $k ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 6:
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'javascript&#0000058alert(1);', $result );
</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"> foreach ( $safe as $x ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_kses_bad_protocol( wp_kses_normalize_entities( $x ), array( 'http', 'https', 'dummy' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $result != $x && $result != 'http://example.org/' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $result !== $x && 'http://example.org/' !== $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->fail( "wp_kses_bad_protocol incorrectly blocked $x" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,17 +192,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hackers_attacks() {
</span><span class="cx" style="display: block; padding: 0 10px"> $xss = simplexml_load_file( DIR_TESTDATA . '/formatting/xssAttacks.xml' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $xss->attack as $attack ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $attack->name, array( 'IMG Embedded commands 2', 'US-ASCII encoding', 'OBJECT w/Flash 2', 'Character Encoding Example' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $attack->name, array( 'IMG Embedded commands 2', 'US-ASCII encoding', 'OBJECT w/Flash 2', 'Character Encoding Example' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $code = (string) $attack->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">- if ( $code == 'See Below' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'See Below' === $code ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $code, 0, 4 ) == 'perl' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( substr( $code, 0, 4 ) === 'perl' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pos = strpos( $code, '"' ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $code = substr( $code, $pos, strrpos( $code, '"' ) - $pos );
</span><span class="cx" style="display: block; padding: 0 10px"> $code = str_replace( '\0', "\0", $code );
</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"> $result = trim( wp_kses_data( $code ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $result == '' || $result == 'XSS' || $result == 'alert("XSS");' || $result == "alert('XSS');" ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $result, array( '', 'XSS', 'alert("XSS");', "alert('XSS');" ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_kses_allowed_html_filter( $html, $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $context ) {
</ins><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="cx" style="display: block; padding: 0 10px"> return array( 'a' => array( 'href' => false ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nloadTextdomainJustInTimephp"></a>
<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/loadTextdomainJustInTime.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,15 +175,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'de_DE' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected_de_DE = i18n_plugin_test();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_de_de = i18n_plugin_test();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'es_ES' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected_es_ES = i18n_plugin_test();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_es_es = i18n_plugin_test();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'Das ist ein Dummy Plugin', $expected_de_DE );
- $this->assertSame( 'This is a dummy plugin', $expected_es_ES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'Das ist ein Dummy Plugin', $expected_de_de );
+ $this->assertSame( 'This is a dummy plugin', $expected_es_es );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nlocaleSwitcherphp"></a>
<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/localeSwitcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/localeSwitcher.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/l10n/localeSwitcher.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,25 +86,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'de_DE' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_locale_de_DE = clone $wp_locale;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_locale_de_de = clone $wp_locale;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSetsWithIndex( $expected, $wp_locale_de_DE->number_format );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( $expected, $wp_locale_de_de->number_format );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_switch_to_locale_en_US() {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'en_GB' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale_en_GB = get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale_en_gb = get_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'en_US' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale_en_US = get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale_en_us = get_locale();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'en_GB', $locale_en_GB );
- $this->assertSame( 'en_US', $locale_en_US );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'en_GB', $locale_en_gb );
+ $this->assertSame( 'en_US', $locale_en_us );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_switch_to_locale_multiple_times() {
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/l10n.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,16 +75,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $textdomains_expected, array_keys( $installed_translations ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $installed_translations['default']['en_GB'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_en_GB = $installed_translations['default']['en_GB'];
- $this->assertEquals( '2016-10-26 00:01+0200', $data_en_GB['PO-Revision-Date'] );
- $this->assertEquals( 'Development (4.4.x)', $data_en_GB['Project-Id-Version'] );
- $this->assertEquals( 'Poedit 1.8.10', $data_en_GB['X-Generator'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_en_gb = $installed_translations['default']['en_GB'];
+ $this->assertEquals( '2016-10-26 00:01+0200', $data_en_gb['PO-Revision-Date'] );
+ $this->assertEquals( 'Development (4.4.x)', $data_en_gb['Project-Id-Version'] );
+ $this->assertEquals( 'Poedit 1.8.10', $data_en_gb['X-Generator'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $installed_translations['admin']['es_ES'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_es_ES = $installed_translations['admin']['es_ES'];
- $this->assertEquals( '2016-10-25 18:29+0200', $data_es_ES['PO-Revision-Date'] );
- $this->assertEquals( 'Administration', $data_es_ES['Project-Id-Version'] );
- $this->assertEquals( 'Poedit 1.8.10', $data_es_ES['X-Generator'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_es_es = $installed_translations['admin']['es_ES'];
+ $this->assertEquals( '2016-10-25 18:29+0200', $data_es_es['PO-Revision-Date'] );
+ $this->assertEquals( 'Administration', $data_es_es['Project-Id-Version'] );
+ $this->assertEquals( 'Poedit 1.8.10', $data_es_es['X-Generator'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestslinkthemeFilephp"></a>
<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/themeFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/themeFile.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/link/themeFile.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,9 +8,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'symlink' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::markTestSkipped( 'symlink() is not available.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! @symlink( DIR_TESTDATA . '/theme-file-parent', WP_CONTENT_DIR . '/themes/theme-file-parent' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::markTestSkipped( 'Could not create parent symlink.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! @symlink( DIR_TESTDATA . '/theme-file-child', WP_CONTENT_DIR . '/themes/theme-file-child' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::markTestSkipped( 'Could not create child symlink.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/media.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> * @ticket 33016
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_wp_embed_shortcode_custom( $content, $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'https://www.example.com/?video=1' == $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'https://www.example.com/?video=1' === $url ) {
</ins><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="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1446,7 +1446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $intermediates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $intermediates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1491,7 +1491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $intermediates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $intermediates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir_url . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1568,7 +1568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $intermediates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $intermediates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1847,7 +1847,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $intermediates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $intermediates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
</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="trunktestsphpunittestsmetaregisterMetaphp"></a>
<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/registerMeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/registerMeta.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/meta/registerMeta.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,7 +505,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_get_object_subtype_for_customtype( $subtype, $object_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $object_id % 2 === 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === ( $object_id % 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'odd';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/meta.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,6 +370,7 @@
</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 class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- intentional implicit casting check
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( floor( $string_mid ) == $string_mid );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( false, get_metadata_by_mid( 'user', $string_mid ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( false, update_metadata_by_mid( 'user', $string_mid, 'meta_new_value_2' ) );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> // Our comparison of space relies on an initial value of 0. If a previous test has failed or if the
</span><span class="cx" style="display: block; padding: 0 10px"> // src directory already contains a content directory with site content, then the initial expectation
</span><span class="cx" style="display: block; padding: 0 10px"> // will be polluted. We create sites until an empty one is available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( 0 != get_space_used() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( 0 !== get_space_used() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</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"> switch_to_blog( $blog_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"> // We don't rely on an initial value of 0 for space used, but should have a clean space available
</span><span class="cx" style="display: block; padding: 0 10px"> // so that we can remove any uploaded files and directories without concern of a conflict with
</span><span class="cx" style="display: block; padding: 0 10px"> // existing content directories in src.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( 0 != get_space_used() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( 0 !== get_space_used() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</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"> switch_to_blog( $blog_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/multisite/site.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,8 +166,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check existence of each database table for the created site.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables( 'blog', false ) as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $suppress = $wpdb->suppress_errors();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
+
+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The table should exist.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,8 +177,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $table_fields );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And the table should not be empty, unless commentmeta, termmeta, or links.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'commentmeta' == $table || 'termmeta' == $table || 'links' == $table ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'commentmeta' === $table || 'termmeta' === $table || 'links' === $table ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,8 +249,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables( 'blog', false ) as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $suppress = $wpdb->suppress_errors();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
+
+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $table_fields, $prefix . $table );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,8 +290,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables( 'blog', false ) as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $suppress = $wpdb->suppress_errors();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
+
+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $table_fields );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,8 +331,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables( 'blog', false ) as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $suppress = $wpdb->suppress_errors();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
+
+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $table_fields, $prefix . $table );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,7 +869,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> function _domain_exists_cb( $exists, $domain, $path, $site_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'foo' == $domain && 'bar/' == $path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'foo' === $domain && 'bar/' === $path ) {
</ins><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="cx" style="display: block; padding: 0 10px"> return null;
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/multisite.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> wpmu_log_new_registrations( 1, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // currently there is no wrapper function for the registration_log
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $reg_blog = $wpdb->get_col( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE '" . $ip . "'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reg_blog = $wpdb->get_col( $wpdb->prepare( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE %s", $ip ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user->user_email, $reg_blog[ count( $reg_blog ) - 1 ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $url === self::UNTRUSTED_PROVIDER_URL ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( self::UNTRUSTED_PROVIDER_URL === $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'response' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'code' => 200,
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/oembed/headers.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = 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">- $this->assertTrue( in_array( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), $headers ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), $headers, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/pomo/mo.php 2019-07-08 00:55:20 UTC (rev 45607)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_overloaded_mb_functions() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ini_get( 'mbstring.func_overload' ) & 2 ) == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ini_get( 'mbstring.func_overload' ) & 2 ) === 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' only runs when mbstring.func_overload is enabled.' );
</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="trunktestsphpunittestspomopluralFormsphp"></a>
<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/pluralForms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/pluralForms.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/pomo/pluralForms.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $plural_expressions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $locales as $slug => $locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plural_expression = $locale->plural_expression;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $plural_expression !== 'n != 1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'n != 1' !== $plural_expression ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plural_expressions[] = array( $slug, $locale->nplurals, $plural_expression );
</span><span class="cx" style="display: block; padding: 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"> $parenthesized = self::parenthesize_plural_expression( $expression );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_style = tests_make_plural_form_function( $nplurals, $parenthesized );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pluralForms = new Plural_Forms( $expression );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plural_forms = new Plural_Forms( $expression );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $generated_old = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $generated_new = 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"> foreach ( range( 0, 200 ) as $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $generated_old[] = $old_style( $i );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $generated_new[] = $pluralForms->get( $i );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $generated_new[] = $plural_forms->get( $i );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $generated_old, $generated_new );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,10 +151,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider simple_provider
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_simple( $expression, $expected ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pluralForms = new Plural_Forms( $expression );
- $actual = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plural_forms = new Plural_Forms( $expression );
+ $actual = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $expected ) as $num ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual[ $num ] = $pluralForms->get( $num );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual[ $num ] = $plural_forms->get( $num );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,9 +212,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_exceptions( $expression, $expected_exception, $call_get ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pluralForms = new Plural_Forms( $expression );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plural_forms = new Plural_Forms( $expression );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $call_get ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pluralForms->get( 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plural_forms->get( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( Exception $e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected_exception, $e->getMessage() );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post/meta.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> 'another value',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $expected );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( get_post_meta( self::$post_id, 'nonunique', true ), $expected ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( get_post_meta( self::$post_id, 'nonunique', true ), $expected, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = get_post_meta( self::$post_id, 'nonunique', false );
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $actual );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,9 +651,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->query( "UPDATE $wpdb->posts SET ID=$new_id WHERE ID=$page_id" );
- $wpdb->query( "UPDATE $wpdb->terms SET term_id=$new_id WHERE term_id=$tag_id" );
- $wpdb->query( "UPDATE $wpdb->term_taxonomy SET term_id=$new_id WHERE term_id=$tag_id" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->update( $wpdb->posts, array( 'ID' => $new_id ), array( 'ID' => $page_id ) );
+ $wpdb->update( $wpdb->terms, array( 'term_id' => $new_id ), array( 'term_id' => $tag_id ) );
+ $wpdb->update( $wpdb->term_taxonomy, array( 'term_id' => $new_id ), array( 'term_id' => $tag_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $new_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostobjectsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/objects.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/objects.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post/objects.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $post = get_post( $id, ARRAY_N );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $post['post_type'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( 'post', $post ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'post', $post, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post, ARRAY_A );
</span></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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post/thumbnails.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> function test_update_post_thumbnail_cache() {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $WP_Query = new WP_Query(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = new WP_Query(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'any',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post__in' => array( self::$post->ID ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,11 +79,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><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( $WP_Query->thumbnails_cached );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $query->thumbnails_cached );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_thumbnail_cache( $WP_Query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_thumbnail_cache( $query );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $WP_Query->thumbnails_cached );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( $query->thumbnails_cached );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</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"> self::$different_post->ID => '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">- $post = $which_post === 1 ? self::$different_post : self::$post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = 1 === $which_post ? self::$different_post : self::$post;
</ins><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="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsposttypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/types.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post/types.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,9 +305,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', array_search( 'bar', $wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInternalType( 'int', array_search( 'bar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_post_type( 'foo' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( array_search( 'bar', $wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( array_search( 'bar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpPostTypephp"></a>
<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/wpPostType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpPostType.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post/wpPostType.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $post_type_object->add_rewrite_rules();
</span><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( in_array( 'foobar', $wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( in_array( 'foobar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_adds_query_var_if_public() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,10 +98,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"> $post_type_object->add_rewrite_rules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $in_array = in_array( 'foobar', $wp->public_query_vars );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $in_array = in_array( 'foobar', $wp->public_query_vars, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object->remove_rewrite_rules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $in_array_after = in_array( 'foobar', $wp->public_query_vars );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $in_array_after = in_array( 'foobar', $wp->public_query_vars, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $in_array );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $in_array_after );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,8 +128,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object->remove_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_tags_after = $wp_rewrite->rewritecode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotFalse( array_search( "%$post_type%", $rewrite_tags ) );
- $this->assertFalse( array_search( "%$post_type%", $rewrite_tags_after ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( array_search( "%$post_type%", $rewrite_tags, true ) );
+ $this->assertFalse( array_search( "%$post_type%", $rewrite_tags_after, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_meta_boxes() {
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/post.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $this->assertEquals( 2, count( $tcache ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tcache = wp_cache_get( $id, 'ctax_relationships' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'cpt' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cpt' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $tcache );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $tcache ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,7 +1008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_utf8mb3_post_saves_with_emoji() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_wpdb = new wpdb_exposed_methods_for_testing();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wpdb = new WpdbExposedMethodsForTesting();
</ins><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="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test is only useful with the utf8 character set' );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2491,7 +2491,7 @@
</span><span class="cx" style="display: 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 revoke_assign_term( $caps, $cap, $user_id, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'assign_term' === $cap && isset( $args[0] ) && $this->forbidden_cat == $args[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'assign_term' === $cap && isset( $args[0] ) && $this->forbidden_cat === $args[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps = array( 'do_not_allow' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $caps;
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-request.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/rest-api/rest-request.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,8 +463,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $valid->get_error_data( 'rest_missing_callback_param' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( 'someinteger', $data['params'] ) );
- $this->assertTrue( in_array( 'someotherinteger', $data['params'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'someinteger', $data['params'], true ) );
+ $this->assertTrue( in_array( 'someotherinteger', $data['params'], true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_valid_params_validate_callback() {
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/rest-api.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> function test_rest_route_query_var() {
</span><span class="cx" style="display: block; padding: 0 10px"> rest_api_init();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( 'rest_route', $GLOBALS['wp']->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'rest_route', $GLOBALS['wp']->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_method() {
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/shortcode.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // [footag foo="bar"]
</span><span class="cx" style="display: block; padding: 0 10px"> function _shortcode_footag( $atts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return @"foo = {$atts['foo']}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo = isset( $atts['foo'] ) ? $atts['foo'] : '';
+ return "foo = $foo";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // [bartag foo="bar"]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Filter shortcode atts in various ways
</span><span class="cx" style="display: block; padding: 0 10px"> function _filter_atts2( $out, $pairs, $atts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If foo attribute equals "foo1", change it to be default value
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $out['foo'] ) && 'foo1' == $out['foo'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $out['foo'] ) && 'foo1' === $out['foo'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out['foo'] = $pairs['foo'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/taxonomy.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,9 +811,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array( 'query_var' => 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', array_search( 'bar', $wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInternalType( 'int', array_search( 'bar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_taxonomy( 'foo' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( array_search( 'bar', $wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( array_search( 'bar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/term/cache.php 2019-07-08 00:55:20 UTC (rev 45607)
</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->assertEquals( $children, count( $hierarchy, COUNT_RECURSIVE ) - count( $hierarchy ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $i % 3 === 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === ( $i % 3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $step = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $step++;
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2474,9 +2474,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $t1, $t2, $t3 ), wp_list_pluck( $found, 'term_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $found as $f ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $t1 == $f->term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $t1 === $f->term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, $f->count );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $t2 == $f->term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $t2 === $f->term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 2, $f->count );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $f->count );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2547,9 +2547,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $t1, $t2, $t3 ), wp_list_pluck( $found, 'term_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $found as $f ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $t1 == $f->term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $t1 === $f->term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $f->count );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $t2 == $f->term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $t2 === $f->term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $f->count );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $f->count );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpInsertTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpInsertTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $cached_children = get_option( 'wptests_tax_children' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $cached_children[ $t ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $found['term_id'], $cached_children[ $t ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $found['term_id'], $cached_children[ $t ], true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpTaxonomyphp"></a>
<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/wpTaxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpTaxonomy.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/term/wpTaxonomy.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $taxonomy_object = new WP_Taxonomy( $taxonomy, 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object->add_rewrite_rules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( in_array( 'foobar', $wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( in_array( 'foobar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_adds_query_var_if_public() {
</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"> $taxonomy_object->add_rewrite_rules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $in_array = in_array( 'foobar', $wp->public_query_vars );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $in_array = in_array( 'foobar', $wp->public_query_vars, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object->remove_rewrite_rules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $in_array_after = in_array( 'foobar', $wp->public_query_vars );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $in_array_after = in_array( 'foobar', $wp->public_query_vars, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $in_array );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $in_array_after );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,8 +74,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object->remove_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_tags_after = $wp_rewrite->rewritecode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotFalse( array_search( "%$taxonomy%", $rewrite_tags ) );
- $this->assertFalse( array_search( "%$taxonomy%", $rewrite_tags_after ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( array_search( "%$taxonomy%", $rewrite_tags, true ) );
+ $this->assertFalse( array_search( "%$taxonomy%", $rewrite_tags_after, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_adds_ajax_callback() {
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_children = get_option( 'wptests_tax_children' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $cached_children[ $t2 ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $found['term_id'], $cached_children[ $t2 ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $found['term_id'], $cached_children[ $t2 ], true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/theme/support.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function supports_foobar( $yesno, $args, $feature ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args[0] == $feature[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args[0] === $feature[0] ) {
</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"> return false;
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/theme/themeDir.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> // Ignore themes in the default /themes directory.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme_name => $theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $theme->get_theme_root() != $this->theme_root ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $theme->get_theme_root() !== $this->theme_root ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $themes[ $theme_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">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( empty( $theme ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = $theme['Template Files'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $this->theme_root . '/page-templates/template-top-level.php', $templates ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $this->theme_root . '/page-templates/template-top-level.php', $templates, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/theme.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> for ( $i = 0; $i < 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $name => $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // switch to this theme
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $i === 2 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 2 === $i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_theme( $theme['Template'], $theme['Stylesheet'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( $theme['Stylesheet'] );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1546,7 +1546,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _nullify_current_user() {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'restore_current_blog', $function_stack ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'restore_current_blog', $function_stack, true ) ) {
</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"> $GLOBALS['current_user'] = null;
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/user/query.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,9 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '', @$users->query_vars['fields'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $users->query_vars['fields'] ) ) {
+ $this->assertEquals( '', $users->query_vars['fields'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users->set( 'fields', 'all' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1136,11 +1138,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foundCount = count( $q->get_results() );
- $expectedCount = 10; // 13 total users minus 3 from query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found_count = count( $q->get_results() );
+ $expected_count = 10; // 13 total users minus 3 from query
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( "AND user_nicename NOT IN ( 'peter','paul','mary' )", $q->query_where );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expectedCount, $foundCount );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $expected_count, $found_count );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1237,11 +1239,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foundCount = count( $q->get_results() );
- $expectedCount = 10; // 13 total users minus 3 from query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found_count = count( $q->get_results() );
+ $expected_count = 10; // 13 total users minus 3 from query
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( "AND user_login NOT IN ( '$user_login1','$user_login2','$user_login3' )", $q->query_where );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expectedCount, $foundCount );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $expected_count, $found_count );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/user.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $found = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // only include the users we just created - there might be some others that existed previously
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $user->ID, $nusers ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $user->ID, $nusers, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found[] = $user->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">@@ -161,7 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // for reasons unclear, the resulting array is indexed numerically; meta keys are not included anywhere.
</span><span class="cx" style="display: block; padding: 0 10px"> // so we'll just check to make sure our values are included somewhere.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vals as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( isset( $out[ $k ] ) && $out[ $k ][0] == $v );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( isset( $out[ $k ] ) && $out[ $k ][0] === $v );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // delete one key and check again
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array_keys( $vals );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,10 +170,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $out = get_user_meta( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure that key is excluded from the results
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vals as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $k == $key_to_delete ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $k === $key_to_delete ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $out[ $k ] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( isset( $out[ $k ] ) && $out[ $k ][0] == $v );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( isset( $out[ $k ] ) && $out[ $k ][0] === $v );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> $this->assertWPError( $id2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @update_user_meta( $id2, 'key', 'value' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( $id2, 'key', 'value' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $metas = array_keys( get_user_meta( 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( 'key', $metas );
</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"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$contrib_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (string) self::$contrib_id, $users, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_search_users_url() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1033,7 +1033,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$contrib_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (string) self::$contrib_id, $users, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_search_users_email() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1044,7 +1044,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$contrib_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (string) self::$contrib_id, $users, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_search_users_nicename() {
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$contrib_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (string) self::$contrib_id, $users, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_search_users_display_name() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,7 +1066,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$contrib_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( (string) self::$contrib_id, $users, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1201,8 +1201,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
- $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
+ $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' === $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $was_admin_email_sent );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1226,8 +1226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
- $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
+ $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' === $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $was_admin_email_sent );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1465,7 +1465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'personal_options_update' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $was_confirmation_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && 'after@example.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $was_confirmation_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && 'after@example.com' === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A confirmation email is sent.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,7 +1502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'personal_options_update' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $was_confirmation_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && 'after@example.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $was_confirmation_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && 'after@example.com' === $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No confirmation email is sent.
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/widgets.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $names = wp_list_pluck( $wp_registered_sidebars, 'name' );
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= $num; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( "$id_base $i", $names ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( "$id_base $i", $names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result[] = 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="trunktestsphpunittestswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/wp.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/wp.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,8 +22,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp->add_query_var( 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $public_qv_count + 2, count( $this->wp->public_query_vars ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( 'test', $this->wp->public_query_vars ) );
- $this->assertTrue( in_array( 'test2', $this->wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'test', $this->wp->public_query_vars, true ) );
+ $this->assertTrue( in_array( 'test2', $this->wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_query_var() {
</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"> $public_qv_count = count( $this->wp->public_query_vars );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp->add_query_var( 'test' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( 'test', $this->wp->public_query_vars ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( 'test', $this->wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->wp->remove_query_var( 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $public_qv_count, count( $this->wp->public_query_vars ) );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2019-07-08 00:55:20 UTC (rev 45607)
</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->assertInternalType( 'string', $result['wp_post_thumbnail'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['wp_post_thumbnail'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $result['wp_post_thumbnail'] ) || $result['postid'] == self::$post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $result['wp_post_thumbnail'] ) || $result['postid'] === self::$post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = get_post_meta( $result['postid'], '_thumbnail_id', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $attachment_id, $result['wp_post_thumbnail'] );
</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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2019-07-08 00:55:20 UTC (rev 45607)
</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"> $this->assertEquals( 1, count( get_post_meta( $post_id, 'enclosure' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For good measure, check that the expected value is in the array
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ), true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to add a brand new enclosure via XML-RPC
</span><span class="cx" style="display: block; padding: 0 10px"> $this->myxmlrpcserver->add_enclosure_if_new( $post_id, $new_enclosure );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,10 +455,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that the new enclosure is in the enclosure meta
</span><span class="cx" style="display: block; padding: 0 10px"> $new_enclosure_string = "{$new_enclosure['url']}\n{$new_enclosure['length']}\n{$new_enclosure['type']}\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $new_enclosure_string, get_post_meta( $post_id, 'enclosure' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $new_enclosure_string, get_post_meta( $post_id, 'enclosure' ), true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that the old enclosure is in the enclosure meta
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ), true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPages.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +55,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_editor_edit_page_cap( $caps, $cap, $user_id, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $cap, array( 'edit_page', 'edit_others_pages' ) ) ) {
- if ( $user_id == self::$editor_id && $args[0] == self::$post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $cap, array( 'edit_page', 'edit_others_pages' ), true ) ) {
+ if ( $user_id === self::$editor_id && $args[0] === self::$post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( false );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // WP#20629
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $result['page_id'] == self::$post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $result['page_id'] === self::$post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found_incapable = true;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2019-07-08 00:55:20 UTC (rev 45607)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,9 +121,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( 0, count( $results ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $term['term_id'] == $cat1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $term['term_id'] === $cat1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break; // found cat1 first as expected
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $term['term_id'] == $cat2 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $term['term_id'] === $cat2 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( false, 'Incorrect category ordering.' );
</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="trunktestsphpunitwpmailrealtestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/wp-mail-real-test.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/wp-mail-real-test.php 2019-07-07 20:48:03 UTC (rev 45606)
+++ trunk/tests/phpunit/wp-mail-real-test.php 2019-07-08 00:55:20 UTC (rev 45607)
</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_install( WP_BLOG_TITLE, WP_USER_NAME, WP_USER_EMAIL, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure we're installed
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-assert( true == is_blog_installed() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+assert( true === is_blog_installed() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore Generic.NamingConventions.UpperCaseConstantName.ConstantNotUpperCase
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'PHPUnit_MAIN_METHOD', false );
</span></span></pre>
</div>
</div>
</body>
</html>