<!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>[44823] trunk/tests/phpunit/includes/abstract-testcase.php: Built/Test Tools: Add missing access modifiers to `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/44823">44823</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/44823","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-08 20:51:32 +0000 (Fri, 08 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'>Built/Test Tools: Add missing access modifiers to `abstract-testcase.php`.
Fixes <a href="https://core.trac.wordpress.org/ticket/46384">#46384</a>.
Props andizer.</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-08 15:36:04 UTC (rev 44822)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2019-03-08 20:51:32 UTC (rev 44823)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +23,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $hooks_saved = array();
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $ignore_files;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __isset( $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __isset( $name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'factory' === $name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __get( $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __get( $name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'factory' === $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return self::factory();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::commit_transaction();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function setUp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function setUp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_time_limit( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$ignore_files ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * After a test method runs, reset any state in WordPress the test method might have changed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function tearDown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tearDown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_query, $wp;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( 'ROLLBACK' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_GET = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> self::flush_cache();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static function flush_cache() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function flush_cache() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_object_cache;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_object_cache->group_ops = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_object_cache->stats = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_meta_keys
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function unregister_all_meta_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function unregister_all_meta_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_keys;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $wp_meta_keys ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function start_transaction() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_transaction() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( 'SET autocommit = 0;' );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( 'START TRANSACTION;' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( 'COMMIT;' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _create_temporary_tables( $query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _create_temporary_tables( $query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $query;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _drop_temporary_tables( $query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _drop_temporary_tables( $query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,11 +373,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $query;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_wp_die_handler( $handler ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_wp_die_handler( $handler ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( $this, 'wp_die_handler' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wp_die_handler( $message ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_die_handler( $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_scalar( $message ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = '0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> throw new WPDieException( $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function expectDeprecated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function expectDeprecated() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $annotations = $this->getAnnotations();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'class', 'method' ) as $depth ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'doing_it_wrong_trigger_error', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function expectedDeprecated() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function expectedDeprecated() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $not_caught_deprecated = array_diff( $this->expected_deprecated, $this->caught_deprecated );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,23 +493,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function deprecated_function_run( $function ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function deprecated_function_run( $function ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $function, $this->caught_deprecated ) ) {
</span><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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function doing_it_wrong_run( $function ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function doing_it_wrong_run( $function ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $function, $this->caught_doing_it_wrong ) ) {
</span><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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertWPError( $actual, $message = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertWPError( $actual, $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $actual, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertNotWPError( $actual, $message = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertNotWPError( $actual, $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $actual ) && '' === $message ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,11 +516,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Error', $actual, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertIXRError( $actual, $message = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertIXRError( $actual, $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $actual, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertNotIXRError( $actual, $message = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertNotIXRError( $actual, $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $actual instanceof IXR_Error && '' === $message ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $actual->message;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $actual, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertEqualFields( $object, $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertEqualFields( $object, $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $field_name => $field_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $object->$field_name != $field_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertDiscardWhitespace( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertDiscardWhitespace( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected Expected array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $actual Array to check.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertEqualSets( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertEqualSets( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> sort( $expected );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,7 +561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $expected Expected array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $actual Array to check.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertEqualSetsWithIndex( $expected, $actual ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertEqualSetsWithIndex( $expected, $actual ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ksort( $expected );
</span><span class="cx" style="display: block; padding: 0 10px"> ksort( $actual );
</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">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $array Array to check.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertNonEmptyMultidimensionalArray( $array ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertNonEmptyMultidimensionalArray( $array ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_array( $array ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $array );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL for the request.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function go_to( $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function go_to( $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // note: the WP and WP_Query classes like to silently fetch parameters
</span><span class="cx" style="display: block; padding: 0 10px"> // from all over the place (globals, GET, etc), which makes it tricky
</span><span class="cx" style="display: block; padding: 0 10px"> // to run them more than once without very carefully clearing everything
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,7 +703,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function knownWPBug( $ticket_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function knownWPBug( $ticket_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,7 +721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function knownUTBug( $ticket_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function knownUTBug( $ticket_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +732,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $ticket_id Ticket number.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function knownPluginBug( $ticket_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function knownPluginBug( $ticket_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,7 +762,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param Text_Template $template
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function prepareTemplate( Text_Template $template ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function prepareTemplate( Text_Template $template ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template->setVar( array( 'constants' => '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $template->setVar( array( 'wp_constants' => PHPUnit_Util_GlobalState::getConstantsAsString() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> parent::prepareTemplate( $template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,7 +777,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool Path on success, else false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function temp_filename() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function temp_filename() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tmp_dir = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $dirs as $dir ) {
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $prop,... Any number of WP_Query properties that are expected to be true for the current request.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function assertQueryTrue() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertQueryTrue() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px"> $all = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_404',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -872,7 +872,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file File path.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function unlink( $file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function unlink( $file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $exists = is_file( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $exists && ! in_array( $file, self::$ignore_files ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> //error_log( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -889,7 +889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Directory path.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function rmdir( $path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function rmdir( $path ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $file, self::$ignore_files ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,7 +907,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - `rmdir()` and its helper methods only delete files that are not listed in the `$ignore_files` property. If
</span><span class="cx" style="display: block; padding: 0 10px"> * called during `tearDown()` in tests, this will only delete files added during the previously run test.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function remove_added_uploads() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function remove_added_uploads() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uploads = wp_upload_dir();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->rmdir( $uploads['basedir'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,7 +921,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of file paths.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function files_in_dir( $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function files_in_dir( $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $files = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $iterator = new RecursiveDirectoryIterator( $dir );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,7 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of file paths.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function scan_user_uploads() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function scan_user_uploads() {
</ins><span class="cx" style="display: block; padding: 0 10px"> static $files = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $files ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $files;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,7 +960,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Path to the directory to scan.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function delete_folders( $path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function delete_folders( $path ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->matched_dirs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_dir( $path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -983,7 +983,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $dir Path to the directory to scan.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function scandir( $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function scandir( $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( scandir( $dir ) as $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== strpos( $path, '.' ) && is_dir( $dir . '/' . $path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->matched_dirs[] = $dir . '/' . $path;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,7 +1050,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error 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">- function _make_attachment( $upload, $parent_post_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _make_attachment( $upload, $parent_post_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $upload['type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $upload['type'];
</span></span></pre>
</div>
</div>
</body>
</html>