<!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>[44916] trunk/tests/phpunit/includes/abstract-testcase.php: Coding Standards: Minor code and performance improvements in `phpunit/includes/abstract-testcase.php`.</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/44916">44916</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/44916","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-15 22:13:30 +0000 (Fri, 15 Mar 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: Minor code and performance improvements in `phpunit/includes/abstract-testcase.php`.
Props andizer.
Fixes <a href="https://core.trac.wordpress.org/ticket/46500">#46500</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2019-03-15 21:58:01 UTC (rev 44915)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2019-03-15 22:13:30 UTC (rev 44916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,7 +387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The altered query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _create_temporary_tables( $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === strpos( trim( $query ), 'CREATE TABLE' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $query;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The altered query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _drop_temporary_tables( $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === strpos( trim( $query ), 'DROP TABLE' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $query;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * first parameter of the `_deprecated_function()` or `_deprecated_argument()` call.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setExpectedDeprecated( $deprecated ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_push( $this->expected_deprecated, $deprecated );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expected_deprecated[] = $deprecated;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * source `_doing_it_wrong()` call.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setExpectedIncorrectUsage( $doing_it_wrong ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expected_doing_it_wrong[] = $doing_it_wrong;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function The deprecated function.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function deprecated_function_run( $function ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $function, $this->caught_deprecated ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $function, $this->caught_deprecated, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->caught_deprecated[] = $function;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function The function to add.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function doing_it_wrong_run( $function ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $function, $this->caught_doing_it_wrong ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $function, $this->caught_doing_it_wrong, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->caught_doing_it_wrong[] = $function;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +586,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $message Optional. Message to display when the assertion fails.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function assertNotWPError( $actual, $message = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $actual ) && '' === $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $message && is_wp_error( $actual ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = $actual->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Error', $actual, $message );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +624,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function assertEqualFields( $object, $fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $field_name => $field_value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $object->$field_name != $field_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $object->$field_name !== $field_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->fail();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -788,7 +788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tickets as $ticket ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $ticket ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->knownWPBug( $ticket );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 === strpos( $ticket, 'Plugin' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ticket = substr( $ticket, 6 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ticket && is_numeric( $ticket ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->knownPluginBug( $ticket );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -805,7 +805,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $ticket_id Ticket number.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function knownWPBug( $ticket_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets, 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"> if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +834,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $ticket_id Ticket number.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function knownPluginBug( $ticket_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets, 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"> if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,7 +950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all as $query_thing ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->$query_thing;
</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( $query_thing, $true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $query_thing, $true, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= $query_thing . ' is false but is expected to be true. ' . PHP_EOL;
</span><span class="cx" style="display: block; padding: 0 10px"> $passed = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,7 +975,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function unlink( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exists = is_file( $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists && ! in_array( $file, self::$ignore_files ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $exists && ! in_array( $file, self::$ignore_files, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> //error_log( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $exists ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,7 +993,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function rmdir( $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $files = $this->files_in_dir( $path );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $files as $file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $file, self::$ignore_files ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $file, self::$ignore_files, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->unlink( $file );
</span><span class="cx" style="display: block; padding: 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,9 +1116,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function delete_user( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return wpmu_delete_user( $user_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- return wp_delete_user( $user_id );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return wp_delete_user( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>