<!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>[53374] branches/6.0/tests/phpunit/tests/user/query.php: Users: Allow any DB field to be returned by `WP_User_Query`.</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/53374">53374</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/53374","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-10 05:51:33 +0000 (Tue, 10 May 2022)</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'>Users: Allow any DB field to be returned by `WP_User_Query`.
Restore behaviour of `fields` parameter in `WP_User_Query` to allow developers to specify any database field to be returned either individually or as part of a subset. Add these fields to the documentation.
When a subset of `fields` includes the `id` paramater, include it in the results in both upper and lowercase to maintain backward compatibility.
Follow up to <a href="https://core.trac.wordpress.org/changeset/53327">[53327]</a>.
Props dd32, pbearne, kraftbj, peterwilsoncc, SergeyBiryukov.
Merges [53362,53373] to the 6.0 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/53177">#53177</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches60srcwpincludesclasswpuserqueryphp">branches/6.0/src/wp-includes/class-wp-user-query.php</a></li>
<li><a href="#branches60testsphpunittestsuserqueryphp">branches/6.0/tests/phpunit/tests/user/query.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches60">branches/6.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.0 2022-05-10 05:47:35 UTC (rev 53373)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.0 2022-05-10 05:51:33 UTC (rev 53374)
</ins><a id="branches60"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:53349,53352,53354,53358,53360,53366,53368
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:53349,53352,53354,53358,53360,53362,53366,53368,53373
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches60srcwpincludesclasswpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/src/wp-includes/class-wp-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/src/wp-includes/class-wp-user-query.php 2022-05-10 05:47:35 UTC (rev 53373)
+++ branches/6.0/src/wp-includes/class-wp-user-query.php 2022-05-10 05:51:33 UTC (rev 53374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,6 +230,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - 'user_email'
</span><span class="cx" style="display: block; padding: 0 10px"> * - 'user_url'
</span><span class="cx" style="display: block; padding: 0 10px"> * - 'user_registered'
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - 'user_pass'
+ * - 'user_activation_key'
+ * - 'user_status'
+ * - 'spam' (only available on multisite installs)
+ * - 'deleted' (only available on multisite installs)
</ins><span class="cx" style="display: block; padding: 0 10px"> * - 'all' for all fields
</span><span class="cx" style="display: block; padding: 0 10px"> * - 'all_with_meta' to include meta fields.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'all'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,25 +280,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $qv = $this->fill_query_vars( $qv );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_fields = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID',
- 'display_name',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_login',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_pass',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_url',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_registered',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_activation_key',
+ 'user_status',
+ 'display_name',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() ) {
+ $allowed_fields[] = 'spam';
+ $allowed_fields[] = 'deleted';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $qv['fields'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qv['fields'] = array_map( 'strtolower', $qv['fields'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $qv['fields'] = array_intersect( array_unique( $qv['fields'] ), $allowed_fields );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $qv['fields'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qv['fields'] = array( 'ID' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qv['fields'] = array( 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $qv['fields'] as $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = 'ID' === $field ? 'ID' : sanitize_key( $field );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = 'id' === $field ? 'ID' : sanitize_key( $field );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields[] = "$wpdb->users.$field";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = implode( ',', $this->query_fields );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +315,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! in_array( $qv['fields'], $allowed_fields, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = "$wpdb->users.ID";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = 'ID' === $qv['fields'] ? 'ID' : sanitize_key( $qv['fields'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = 'id' === strtolower( $qv['fields'] ) ? 'ID' : sanitize_key( $qv['fields'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = "$wpdb->users.$field";
</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">@@ -822,8 +835,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->results ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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 ( 'all_with_meta' === $qv['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ is_array( $qv['fields'] ) &&
+ isset( $this->results[0]->ID )
+ ) {
+ foreach ( $this->results as $result ) {
+ $result->id = $result->ID;
+ }
+ } elseif ( 'all_with_meta' === $qv['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> cache_users( $this->results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = array();
</span></span></pre></div>
<a id="branches60testsphpunittestsuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/tests/user/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/tests/user/query.php 2022-05-10 05:47:35 UTC (rev 53373)
+++ branches/6.0/tests/phpunit/tests/user/query.php 2022-05-10 05:51:33 UTC (rev 53374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1969,14 +1969,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53177
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_returning_fields
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_returning_field_subset_as_string
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @covers WP_User_Query::prepare_query
- *
- * @param $field
- * @param $expected
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $field
+ * @param mixed $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">- public function test_returning_fields( $field, $expected_values ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_returning_field_subset_as_string( $field, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => $field,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1985,118 +1983,219 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $q->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'all_with_meta' === $field ) {
- $data = array_shift( $results )->data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSameSets( $expected, $results );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $data = ( isset( $results[0]->data ) ) ? $results[0]->data : $results[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Data provider
+ *
+ * @return array
+ */
+ function data_returning_field_subset_as_string() {
+ $data = array(
+ 'id' => array(
+ 'fields' => 'id',
+ 'expected' => array( '1' ),
+ ),
+ 'ID' => array(
+ 'fields' => 'ID',
+ 'expected' => array( '1' ),
+ ),
+ 'user_login' => array(
+ 'fields' => 'user_login',
+ 'expected' => array( 'admin' ),
+ ),
+ 'user_nicename' => array(
+ 'fields' => 'user_nicename',
+ 'expected' => array( 'admin' ),
+ ),
+ 'user_email' => array(
+ 'fields' => 'user_email',
+ 'expected' => array( WP_TESTS_EMAIL ),
+ ),
+ 'user_url' => array(
+ 'fields' => 'user_url',
+ 'expected' => array( wp_guess_url() ),
+ ),
+ 'user_status' => array(
+ 'fields' => 'user_status',
+ 'expected' => array( '0' ),
+ ),
+ 'display_name' => array(
+ 'fields' => 'display_name',
+ 'expected' => array( 'admin' ),
+ ),
+ 'invalid_field' => array(
+ 'fields' => 'invalid_field',
+ 'expected' => array( '1' ),
+ ),
+ );
+
+ if ( is_multisite() ) {
+ $data['spam'] = array(
+ 'fields' => 'spam',
+ 'expected' => array( '0' ),
+ );
+ $data['deleted'] = array(
+ 'fields' => 'deleted',
+ 'expected' => array( '0' ),
+ );
</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">- foreach ( $expected_values as $key => $expected_value ) {
- if ( ! is_array( $results ) ) {
- $this->assertEquals( array_shift( $results ), $expected_value );
- } else {
- $value = ( isset( $data->$key ) ) ? $data->$key : $data;
- $this->assertEquals( $value, $expected_value );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $data;
+ }
+
+ /**
+ * @ticket 53177
+ * @dataProvider data_returning_field_subset_as_array
+ *
+ * @param array $field
+ * @param mixed $expected
+ */
+ public function test_returning_field_subset_as_array( $field, $expected ) {
+ $q = new WP_User_Query(
+ array(
+ 'fields' => $field,
+ 'include' => array( '1' ),
+ )
+ );
+ $results = $q->get_results();
+
+ if ( isset( $results[0] ) && is_object( $results[0] ) ) {
+ $results = (array) $results[0];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertSameSetsWithIndex( $expected, $results );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function data_returning_fields() {
- return array(
- 'all' => array(
- 'field' => 'all',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Data provider
+ *
+ * @return array
+ */
+ function data_returning_field_subset_as_array() {
+ $data = array(
+ 'id' => array(
+ 'fields' => array( 'id' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => '1',
- 'user_login' => 'admin',
- 'user_nicename' => 'admin',
- 'user_email' => WP_TESTS_EMAIL,
- 'user_url' => wp_guess_url(),
- 'user_activation_key' => '',
- 'user_status' => '0',
- 'display_name' => 'admin',
- ),
- ),
- 'all_with_meta' => array(
- 'field' => 'all_with_meta',
- 'expected' => array(
- 'ID' => '1',
- 'user_login' => 'admin',
- 'user_nicename' => 'admin',
- 'user_email' => WP_TESTS_EMAIL,
- 'user_url' => wp_guess_url(),
- 'user_activation_key' => '',
- 'user_status' => '0',
- 'display_name' => 'admin',
- ),
- ),
- 'ID' => array(
- 'field' => 'ID',
- 'expected' => array(
</del><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '1',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => '1',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => array(
- 'field' => 'id',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => array(
+ 'fields' => array( 'ID' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '1',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => '1',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'display_name' => array(
- 'field' => 'display_name',
- 'expected' => array(
- 'display_name' => 'admin',
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_login' => array(
+ 'fields' => array( 'user_login' ),
+ 'expected' => array( 'user_login' => 'admin' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_login' => array(
- 'field' => 'user_login',
- 'expected' => array(
- 'user_login' => 'admin',
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_nicename' => array(
+ 'fields' => array( 'user_nicename' ),
+ 'expected' => array( 'user_nicename' => 'admin' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_nicename' => array(
- 'field' => 'user_nicename',
- 'expected' => array(
- 'user_nicename' => 'admin',
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_email' => array(
+ 'fields' => array( 'user_email' ),
+ 'expected' => array( 'user_email' => WP_TESTS_EMAIL ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_email' => array(
- 'field' => 'user_email',
- 'expected' => array(
- 'user_email' => WP_TESTS_EMAIL,
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_url' => array(
+ 'fields' => array( 'user_url' ),
+ 'expected' => array( 'user_url' => wp_guess_url() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'invalid_field' => array(
- 'field' => 'invalid_field',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_status' => array(
+ 'fields' => array( 'user_status' ),
+ 'expected' => array( 'user_status' => '0' ),
+ ),
+ 'display_name' => array(
+ 'fields' => array( 'display_name' ),
+ 'expected' => array( 'display_name' => 'admin' ),
+ ),
+ 'invalid_field' => array(
+ 'fields' => array( 'invalid_field' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '0' => '1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => '1',
+ 'id' => '1',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'valid_array' => array(
- 'field' => array( 'ID', 'display_name' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'valid array inc id' => array(
+ 'fields' => array( 'display_name', 'user_email', 'id' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'display_name' => 'admin',
+ 'user_email' => WP_TESTS_EMAIL,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'display_name' => 'admin',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => '1',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'semivalid_array' => array(
- 'field' => array( 'ID', 'display_name', 'invalid_field' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'valid array inc ID' => array(
+ 'fields' => array( 'display_name', 'user_email', 'ID' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'display_name' => 'admin',
+ 'user_email' => WP_TESTS_EMAIL,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'display_name' => 'admin',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => '1',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'invalid_array' => array(
- 'field' => array( 'invalid_field' ),
- 'expected' => array(
- 'ID' => '1',
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'partly valid array' => array(
+ 'fields' => array( 'display_name', 'invalid_field' ),
+ 'expected' => array( 'display_name' => 'admin' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_multisite() ) {
+ $data['spam'] = array(
+ 'fields' => array( 'spam' ),
+ 'expected' => array( 'spam' => '0' ),
+ );
+ $data['deleted'] = array(
+ 'fields' => array( 'deleted' ),
+ 'expected' => array( 'deleted' => '0' ),
+ );
+ }
+
+ return $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="cx" style="display: block; padding: 0 10px"> * @ticket 53177
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ */
+ public function test_returning_field_all() {
+ $q = new WP_User_Query(
+ array(
+ 'fields' => 'all',
+ 'include' => array( '1' ),
+ )
+ );
+ $results = $q->get_results();
+ $user_data = (array) $results[0]->data;
+
+ $expected_results = array(
+ 'ID' => '1',
+ 'user_login' => 'admin',
+ 'user_nicename' => 'admin',
+ 'user_url' => wp_guess_url(),
+ 'user_email' => WP_TESTS_EMAIL,
+ 'user_activation_key' => '',
+ 'user_status' => '0',
+ 'display_name' => 'admin',
+ );
+
+ if ( is_multisite() ) {
+ $expected_results['spam'] = '0';
+ $expected_results['deleted'] = '0';
+ }
+
+ // These change for each run.
+ unset( $user_data['user_pass'], $user_data['user_registered'] );
+
+ $this->assertSameSetsWithIndex( $expected_results, $user_data );
+ $this->assertInstanceOf( 'WP_User', $results[0] );
+ }
+
+ /**
+ * @ticket 53177
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_User_Query::prepare_query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>