<!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>[44573] trunk: Coding Standards: Fix and whitelist variable names.</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/44573">44573</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/44573","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-01-12 06:05:55 +0000 (Sat, 12 Jan 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 and whitelist variable names.
>From the `WordPress.NamingConventions.ValidVariableName` sniff, this commit fixes/whitelists all `NotSnakeCaseMemberVar`, `MemberNotSnakeCase`, and `StringNotSnakeCase` violations. It also fixes a handful of the `NotSnakeCase` violations.
See <a href="https://core.trac.wordpress.org/ticket/45934">#45934</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkphpcsxmldist">trunk/phpcs.xml.dist</a></li>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunktestsphpunittestsavatarphp">trunk/tests/phpunit/tests/avatar.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralwpErrorphp">trunk/tests/phpunit/tests/general/wpError.php</a></li>
<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#trunktestsphpunittestshttpcurlphp">trunk/tests/phpunit/tests/http/curl.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-01-12 04:52:53 UTC (rev 44572)
+++ trunk/phpcs.xml.dist 2019-01-12 06:05:55 UTC (rev 44573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,60 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <rule ref="WordPress.NamingConventions.ValidVariableName">
+ <properties>
+ <property name="customPropertiesWhitelist" type="array">
+ <!-- From database structure queries -->
+ <element value="Collation"/>
+ <element value="Column_name"/>
+ <element value="Default"/>
+ <element value="Extra"/>
+ <element value="Field"/>
+ <element value="Index_type"/>
+ <element value="Key"/>
+ <element value="Key_name"/>
+ <element value="Msg_text"/>
+ <element value="Non_unique"/>
+ <element value="Null"/>
+ <element value="Sub_part"/>
+ <element value="Type"/>
+ <!-- From plugin/theme data -->
+ <element value="authorAndUri"/>
+ <element value="Name"/>
+ <element value="Version"/>
+ <!-- From the result of wp_xmlrpc_server::wp_getPageList() -->
+ <element value="dateCreated"/>
+
+ <!-- From DOMDocument -->
+ <element value="childNodes"/>
+ <element value="formatOutput"/>
+ <element value="nodeName"/>
+ <element value="nodeType"/>
+ <element value="parentNode"/>
+ <element value="preserveWhiteSpace"/>
+ <element value="textContent"/>
+ <!-- From PHPMailer -->
+ <element value="AltBody"/>
+ <element value="Body"/>
+ <element value="CharSet"/>
+ <element value="ContentType"/>
+ <element value="Encoding"/>
+ <element value="Hostname"/>
+ <element value="mailHeader"/>
+ <element value="MIMEBody"/>
+ <element value="MIMEHeader"/>
+ <element value="Sender"/>
+ <element value="Subject"/>
+ <!-- From PHPUnit_Util_Getopt -->
+ <element value="longOptions"/>
+ <!-- From POP3 -->
+ <element value="ERROR"/>
+ <!-- From ZipArchive -->
+ <element value="numFiles"/>
+ </property>
+ </properties>
+ </rule>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <arg name="extensions" value="php"/>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Strip the filepaths down to the relevant bit. -->
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcommentqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-comment-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment-query.php 2019-01-12 04:52:53 UTC (rev 44572)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2019-01-12 06:05:55 UTC (rev 44573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preg_split( '/[,\s]/', $this->query_vars['orderby'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_array = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found_orderby_comment_ID = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found_orderby_comment_id = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ordersby as $_key => $_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,8 +569,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_order = $_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
- $found_orderby_comment_ID = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $found_orderby_comment_id && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
+ $found_orderby_comment_id = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = $this->parse_orderby( $_orderby );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,24 +593,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // To ensure determinate sorting, always include a comment_ID clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $found_orderby_comment_ID ) {
- $comment_ID_order = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $found_orderby_comment_id ) {
+ $comment_id_order = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Inherit order from comment_date or comment_date_gmt, if available.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $orderby_array as $orderby_clause ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_ID_order = $match[1];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id_order = $match[1];
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no date-related order is available, use the date from the first available clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $comment_ID_order ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $comment_id_order ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $orderby_array as $orderby_clause ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( 'ASC', $orderby_clause ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_ID_order = 'ASC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id_order = 'ASC';
</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">- $comment_ID_order = 'DESC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id_order = 'DESC';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,11 +618,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"> // Default to DESC.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $comment_ID_order ) {
- $comment_ID_order = 'DESC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $comment_id_order ) {
+ $comment_id_order = 'DESC';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby_array[] = "$wpdb->comments.comment_ID $comment_id_order";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = implode( ', ', $orderby_array );
</span></span></pre></div>
<a id="trunktestsphpunittestsavatarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/avatar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/avatar.php 2019-01-12 04:52:53 UTC (rev 44572)
+++ trunk/tests/phpunit/tests/avatar.php 2019-01-12 06:05:55 UTC (rev 44573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,21 +103,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $url, $url2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 $fakeURL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $fake_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pre_get_avatar_url_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fakeURL = 'haha wat';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->fake_url = 'haha wat';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_avatar_data', array( $this, 'pre_get_avatar_url_filter' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_avatar_url( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_get_avatar_data', array( $this, 'pre_get_avatar_url_filter' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $url, $this->fakeURL );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $url, $this->fake_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> public function pre_get_avatar_url_filter( $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['url'] = $this->fakeURL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['url'] = $this->fake_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> return $args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,16 +125,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_avatar_url_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fakeURL = 'omg lol';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->fake_url = 'omg lol';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_avatar_url', array( $this, 'get_avatar_url_filter' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_avatar_url( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'get_avatar_url', array( $this, 'get_avatar_url_filter' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $url, $this->fakeURL );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $url, $this->fake_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_avatar_url_filter( $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->fakeURL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->fake_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,21 +207,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $fakeIMG;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $fake_img;
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pre_get_avatar_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fakeIMG = 'YOU TOO?!';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->fake_img = 'YOU TOO?!';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_avatar', array( $this, 'pre_get_avatar_filter' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $img = get_avatar( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_get_avatar', array( $this, 'pre_get_avatar_filter' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $img, $this->fakeIMG );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $img, $this->fake_img );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> public function pre_get_avatar_filter( $img ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->fakeIMG;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->fake_img;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 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,16 +228,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_avatar_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fakeURL = 'YA RLY';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->fake_url = 'YA RLY';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_avatar', array( $this, 'get_avatar_filter' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $img = get_avatar( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'get_avatar', array( $this, 'get_avatar_filter' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $img, $this->fakeURL );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $img, $this->fake_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_avatar_filter( $img ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->fakeURL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->fake_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></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-01-12 04:52:53 UTC (rev 44572)
+++ trunk/tests/phpunit/tests/functions.php 2019-01-12 06:05:55 UTC (rev 44573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_parse_args_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new MockClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $x->_baba = 5;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->yZ = 'baba';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $x->yZ = 'baba'; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.NotSnakeCaseMemberVar
</ins><span class="cx" style="display: block; padding: 0 10px"> $x->a = array( 5, 111, 'x' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> function test_wp_parse_args_defaults() {
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new MockClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $x->_baba = 5;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $x->yZ = 'baba';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $x->yZ = 'baba'; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.NotSnakeCaseMemberVar
</ins><span class="cx" style="display: block; padding: 0 10px"> $x->a = array( 5, 111, 'x' );
</span><span class="cx" style="display: block; padding: 0 10px"> $d = array( 'pu' => 'bu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralwpErrorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/wpError.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpError.php 2019-01-12 04:52:53 UTC (rev 44572)
+++ trunk/tests/phpunit/tests/general/wpError.php 2019-01-12 06:05:55 UTC (rev 44573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $WP_Error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $wp_error;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set up.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,27 +22,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error = new WP_Error();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error = new WP_Error();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_WP_Error_should_be_of_type_WP_Error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertWPError( $this->WP_Error );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertWPError( $this->wp_error );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_WP_Error_with_default_empty_parameters_should_add_no_errors() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_WP_Error_with_empty_code_should_add_no_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_WP_Error_with_empty_code_should_add_no_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '', $this->WP_Error->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_message() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_WP_Error_with_empty_code_should_add_no_error_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_WP_Error_with_code_and_empty_message_should_add_error_with_that_code() {
</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"> * @covers ::get_error_codes()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_codes_with_no_errors_should_return_empty_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( $this->WP_Error->get_error_codes() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->get_error_codes() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,9 +110,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_codes()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_codes_with_one_error_should_return_an_array_with_only_that_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertEqualSets( array( 'code' ), $this->WP_Error->get_error_codes() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( 'code' ), $this->wp_error->get_error_codes() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,12 +119,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_codes()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_codes_with_multiple_errors_should_return_an_array_of_those_codes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'code', 'code2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSets( $expected, $this->WP_Error->get_error_codes() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( $expected, $this->wp_error->get_error_codes() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_code()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_code_with_no_errors_should_return_an_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,9 +138,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_code()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_code_with_one_error_should_return_that_error_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( 'code', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'code', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,10 +147,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_code()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_code_with_multiple_errors_should_return_only_the_first_error_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</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->assertSame( 'code', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'code', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_messages()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_messages_with_empty_code_and_no_errors_should_return_an_empty_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( $this->WP_Error->get_error_messages() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->get_error_messages() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,9 +164,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_messages()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_messages_with_empty_code_one_error_should_return_an_array_with_that_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertEqualSets( array( 'message' ), $this->WP_Error->get_error_messages() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( 'message' ), $this->wp_error->get_error_messages() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,10 +173,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_messages()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_messages_with_empty_code_multiple_errors_should_return_an_array_of_messages() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</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->assertEqualSets( array( 'message', 'message2' ), $this->WP_Error->get_error_messages() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( 'message', 'message2' ), $this->wp_error->get_error_messages() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_messages()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_messages_with_an_invalid_code_should_return_an_empty_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( $this->WP_Error->get_error_messages( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->get_error_messages( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,9 +190,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_messages()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_messages_with_one_error_should_return_an_array_with_that_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertEqualSets( array( 'message' ), $this->WP_Error->get_error_messages( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( 'message' ), $this->wp_error->get_error_messages( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,10 +199,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_messages()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_messages_with_multiple_errors_same_code_should_return_an_array_with_all_messages() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code', 'message2' );
</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->assertequalSets( array( 'message', 'message2' ), $this->WP_Error->get_error_messages( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertequalSets( array( 'message', 'message2' ), $this->wp_error->get_error_messages( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_empty_code_and_no_errors_should_return_an_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '', $this->WP_Error->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_message() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,9 +216,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_empty_code_and_one_error_should_return_that_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( 'message', $this->WP_Error->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'message', $this->wp_error->get_error_message() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,10 +225,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_empty_code_and_multiple_errors_should_return_the_first_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</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->assertSame( 'message', $this->WP_Error->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'message', $this->wp_error->get_error_message() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,11 +235,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_empty_code_and_multiple_errors_multiple_codes_should_return_the_first_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
- $this->WP_Error->add( 'code', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
+ $this->wp_error->add( 'code', 'message2' );
</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->assertSame( 'message', $this->WP_Error->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'message', $this->wp_error->get_error_message() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_invalid_code_and_no_errors_should_return_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '', $this->WP_Error->get_error_message( 'invalid' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_message( 'invalid' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,9 +253,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_invalid_code_and_one_error_should_return_an_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( '', $this->WP_Error->get_error_message( 'invalid' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_message( 'invalid' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,10 +262,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_message_with_invalid_code_and_multiple_errors_should_return_an_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</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->assertSame( '', $this->WP_Error->get_error_message( 'invalid' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_message( 'invalid' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_empty_code_and_no_errors_should_evaluate_as_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( null, $this->WP_Error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,9 +279,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_empty_code_one_error_no_data_should_evaluate_as_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( null, $this->WP_Error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,10 +288,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_empty_code_multiple_errors_no_data_should_evaluate_as_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</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->assertSame( null, $this->WP_Error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,9 +299,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_empty_code_and_one_error_with_data_should_return_that_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'data-key' => 'data-value' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', $expected );
</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->assertEqualSetsWithIndex( $expected, $this->WP_Error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,10 +309,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_empty_code_and_multiple_errors_different_codes_should_return_the_last_data_of_the_first_code() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'data-key' => 'data-value' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', $expected );
- $this->WP_Error->add( 'code2', 'message2', 'data2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', $expected );
+ $this->wp_error->add( 'code2', 'message2', 'data2' );
</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->assertEqualSetsWithIndex( $expected, $this->WP_Error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,11 +319,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_empty_code_and_multiple_errors_same_code_should_return_the_last_data_of_the_first_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
- $this->WP_Error->add( 'code', 'message2', 'data2' );
- $this->WP_Error->add( 'code2', 'message2', 'data3' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
+ $this->wp_error->add( 'code', 'message2', 'data2' );
+ $this->wp_error->add( 'code2', 'message2', 'data3' );
</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->assertSame( 'data2', $this->WP_Error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data2', $this->wp_error->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_code_and_no_errors_should_evaluate_as_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( null, $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,9 +337,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_code_and_one_error_with_no_data_should_evaluate_as_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( null, $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,9 +347,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_code_and_one_error_with_data_should_return_that_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'data-key' => 'data-value' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', $expected );
</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->assertEqualSetsWithIndex( $expected, $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,11 +357,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_code_and_multiple_errors_different_codes_should_return_the_last_stored_data_of_the_code() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'data3' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
- $this->WP_Error->add( 'code2', 'message2', 'data2' );
- $this->WP_Error->add( 'code', 'message3', $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
+ $this->wp_error->add( 'code2', 'message2', 'data2' );
+ $this->wp_error->add( 'code', 'message3', $expected );
</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->assertEqualSetsWithIndex( $expected, $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,11 +368,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_error_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_error_data_with_code_and_multiple_errors_same_code_should_return_the_last_stored_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
- $this->WP_Error->add( 'code', 'message2', 'data2' );
- $this->WP_Error->add( 'code2', 'message3', 'data3' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
+ $this->wp_error->add( 'code', 'message2', 'data2' );
+ $this->wp_error->add( 'code2', 'message3', 'data3' );
</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->assertSame( 'data2', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data2', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_errors()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_errors_with_no_errors_returns_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $this->WP_Error->has_errors() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $this->wp_error->has_errors() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,8 +386,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_errors()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_errors_with_errors_returns_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
- $this->assertTrue( $this->WP_Error->has_errors() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
+ $this->assertTrue( $this->wp_error->has_errors() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,9 +394,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_empty_code_empty_message_empty_data_should_add_empty_key_to_errors_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( '', '', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( '', '', 'data' );
</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->assertArrayHasKey( '', $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertArrayHasKey( '', $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,9 +403,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_empty_code_empty_message_empty_data_should_add_empty_message_to_errors_array_under_empty_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( '', '', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( '', '', 'data' );
</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->assertEqualSetsWithIndex( array( '' => array( '' ) ), $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( array( '' => array( '' ) ), $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,9 +412,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_empty_code_empty_message_empty_data_should_not_alter_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( '', '', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( '', '', '' );
</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->assertEmpty( $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,9 +421,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_empty_code_empty_message_non_empty_data_should_store_data_under_an_empty_code_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( '', '', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( '', '', 'data' );
</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->assertEqualSetsWithIndex( array( '' => 'data' ), $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( array( '' => 'data' ), $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,9 +430,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_empty_message_empty_data_should_add_error_with_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', '' );
</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->assertSame( 'code', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'code', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,9 +439,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_empty_message_empty_data_should_add_error_with_empty_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', '' );
</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->assertSame( '', $this->WP_Error->get_error_message( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', $this->wp_error->get_error_message( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,9 +448,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_empty_message_empty_data_should_not_add_error_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', '' );
</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->assertSame( null, $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,9 +457,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_message_and_empty_data_should_should_add_error_with_that_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( 'message', $this->WP_Error->get_error_message( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'message', $this->wp_error->get_error_message( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,9 +466,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_message_and_empty_data_should_not_alter_stored_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->assertSame( null, $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( null, $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,9 +475,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_empty_message_and_data_should_add_error_with_that_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', '', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', '', 'data' );
</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->assertSame( 'code', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'code', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,9 +484,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_empty_message_and_data_should_store_that_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', '', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', '', 'data' );
</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->assertSame( 'data', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,9 +493,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_message_and_data_should_add_an_error_with_that_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
</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->assertSame( 'code', $this->WP_Error->get_error_code() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'code', $this->wp_error->get_error_code() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,9 +502,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_message_and_data_should_add_an_error_with_that_message() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
</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->assertSame( 'message', $this->WP_Error->get_error_message( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'message', $this->wp_error->get_error_message( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,9 +511,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_with_code_and_message_and_data_should_store_that_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
</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->assertSame( 'data', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,12 +520,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_multiple_times_with_the_same_code_should_add_additional_messages_for_that_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code', 'message2' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'message', 'message2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSets( $expected, $this->WP_Error->get_error_messages( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( $expected, $this->wp_error->get_error_messages( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,10 +532,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_multiple_times_with_the_same_code_and_different_data_should_store_only_the_last_added_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data-bar' );
- $this->WP_Error->add( 'code', 'message2', 'data-baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data-bar' );
+ $this->wp_error->add( 'code', 'message2', 'data-baz' );
</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->assertSame( 'data-baz', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data-baz', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,9 +542,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_empty_data_empty_code_should_create_orphaned_data_with_no_error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add_data( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( '' );
</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->assertEmpty( $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,9 +551,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_empty_data_empty_code_no_errors_should_create_data_under_an_empty_code_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add_data( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( '' );
</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->assertEqualSets( array( '' => '' ), $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( '' => '' ), $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,10 +560,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_empty_code_and_one_error_should_store_the_data_under_that_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add_data( 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add_data( 'data' );
</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->assertSame( 'data', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,12 +570,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_empty_code_and_multiple_errors_with_different_codes_should_store_it_under_the_first_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
</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->WP_Error->add_data( 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data' );
</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->assertSame( 'data', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,13 +582,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_empty_code_and_multiple_errors_with_same_code_should_store_it_under_the_first_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
- $this->WP_Error->add( 'code2', 'message2' );
- $this->WP_Error->add( 'code', 'message3' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
+ $this->wp_error->add( 'code2', 'message2' );
+ $this->wp_error->add( 'code', 'message3' );
</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->WP_Error->add_data( 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data' );
</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->assertSame( 'data', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,9 +595,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_and_code_and_no_errors_should_create_orphaned_data_with_no_error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add_data( 'data', 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data', 'code' );
</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->assertEmpty( $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,9 +604,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_and_code_no_errors_should_create_data_under_that_code_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add_data( 'data', 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data', 'code' );
</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->assertEqualSets( array( 'code' => 'data' ), $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( 'code' => 'data' ), $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,11 +613,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_and_code_one_error_different_code_should_create_orphaned_data_with_no_error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->WP_Error->add_data( 'data', 'code2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data', 'code2' );
</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->assertEqualSetsWithIndex( array( 'code' => array( 'message' ) ), $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( array( 'code' => array( 'message' ) ), $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,11 +624,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_and_code_one_error_different_code_should_create_data_under_that_code_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->WP_Error->add_data( 'data', 'code2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data', 'code2' );
</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->assertEqualSetsWithIndex( array( 'code2' => 'data' ), $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSetsWithIndex( array( 'code2' => 'data' ), $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,11 +635,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::add_data()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_data_with_data_and_code_should_add_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->WP_Error->add_data( 'data', 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add_data( 'data', 'code' );
</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->assertSame( 'data', $this->WP_Error->get_error_data( 'code' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'data', $this->wp_error->get_error_data( 'code' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,11 +646,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_with_no_errors_should_affect_nothing() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $before = $this->WP_Error->errors;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $before = $this->wp_error->errors;
</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->WP_Error->remove( 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->remove( 'code' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $after = $this->WP_Error->errors;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $after = $this->wp_error->errors;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex( $before, $after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -659,11 +659,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_empty_code_no_errors_should_affect_nothing() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $before = $this->WP_Error->errors;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $before = $this->wp_error->errors;
</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->WP_Error->remove( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->remove( '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $after = $this->WP_Error->errors;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $after = $this->wp_error->errors;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex( $before, $after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,13 +672,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_empty_code_and_one_error_with_empty_string_code_should_remove_error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $before = $this->WP_Error->errors;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $before = $this->wp_error->errors;
</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->WP_Error->add( '', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( '', 'message' );
</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->WP_Error->remove( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->remove( '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $after = $this->WP_Error->errors;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $after = $this->wp_error->errors;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex( $before, $after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,13 +687,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_empty_code_and_one_error_with_empty_string_code_should_remove_error_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( '', 'message', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( '', 'message', 'data' );
</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->WP_Error->remove( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->remove( '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $after = $this->WP_Error->error_data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $after = $this->wp_error->error_data;
</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->assertEmpty( $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,11 +700,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_should_remove_the_error_with_the_given_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message' );
</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->WP_Error->remove( 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->remove( 'code' );
</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->assertEmpty( $this->WP_Error->errors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->errors );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,11 +711,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::remove()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_should_remove_the_error_data_associated_with_the_given_code() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Error->add( 'code', 'message', 'data' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->add( 'code', 'message', 'data' );
</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->WP_Error->remove( 'code' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_error->remove( 'code' );
</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->assertEmpty( $this->WP_Error->error_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $this->wp_error->error_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></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-01-12 04:52:53 UTC (rev 44572)
+++ trunk/tests/phpunit/tests/http/base.php 2019-01-12 06:05:55 UTC (rev 44573)
</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"> abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> // You can use your own version of data/WPHTTP-testcase-redirection-script.php here.
</span><span class="cx" style="display: block; padding: 0 10px"> var $redirection_script = 'http://api.wordpress.org/core/tests/1.0/redirection.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $fileStreamUrl = 'http://s.w.org/screenshots/3.9/dashboard.png';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $file_stream_url = 'http://s.w.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected $http_request_args;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_file_stream() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $this->fileStreamUrl;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = $this->file_stream_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $size = 153204;
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26726
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_file_stream_limited_size() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $this->fileStreamUrl;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = $this->file_stream_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $size = 10000;
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31172
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_request_limited_size() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $this->fileStreamUrl;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = $this->file_stream_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $size = 10000;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span></span></pre></div>
<a id="trunktestsphpunittestshttpcurlphp"></a>
<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/curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/curl.php 2019-01-12 04:52:53 UTC (rev 44572)
+++ trunk/tests/phpunit/tests/http/curl.php 2019-01-12 06:05:55 UTC (rev 44573)
</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"> public function test_http_api_curl_stream_parameter_is_a_reference() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'http_api_curl', array( $this, '_action_test_http_api_curl_stream_parameter_is_a_reference' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fileStreamUrl,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->file_stream_url,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'stream' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 30,
</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-01-12 04:52:53 UTC (rev 44572)
+++ trunk/tests/phpunit/tests/user.php 2019-01-12 06:05:55 UTC (rev 44573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,6 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20043
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_user_unset() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:disable WordPress.NamingConventions.ValidVariableName.NotSnakeCaseMemberVar
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test custom fields
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,6 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $user->customField );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $user->customField ) );
</span><span class="cx" style="display: block; padding: 0 10px"> return $user;
</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>
</div>
</body>
</html>