Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix validation of array of fields + adjust tests #2656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
felipeelia wants to merge 3 commits into from
Closed

Fix validation of array of fields + adjust tests #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32edc29
Fix validation of array of fields + adjust tests
felipeelia Apr 30, 2022
e998a06
Fix short array syntax usage
felipeelia Apr 30, 2022
216e9a5
Adjust WP_User_Query parameter + hard coded values
felipeelia May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/wp-includes/class-wp-user-query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,22 @@ public function prepare_query( $query = array() ) {
);

if ( is_array( $qv['fields'] ) ) {
$qv['fields'] = array_unique( $qv['fields'] );
$qv['fields'] = array_intersect( array_unique( $qv['fields'] ), $allowed_fields );

if ( empty( $qv['fields'] ) ) {
$qv['fields'] = array( 'ID' );
}

$this->query_fields = array();
foreach ( $qv['fields'] as $field ) {
$field = 'ID' === $field ? 'ID' : sanitize_key( $field );
$this->query_fields[] = "$wpdb->users.$field";
}
$this->query_fields = implode( ',', $this->query_fields );
} elseif ( ! in_array( $qv['fields'], $allowed_fields, true ) ) {
} elseif ( 'all' === $qv['fields'] ) {
$this->query_fields = "$wpdb->users.*";
} elseif ( ! in_array( $qv['fields'], $allowed_fields, true ) ) {
$this->query_fields = "$wpdb->users.ID";
} else {
$field = 'ID' === $qv['fields'] ? 'ID' : sanitize_key( $qv['fields'] );
$this->query_fields = "$wpdb->users.$field";
Expand Down
56 changes: 41 additions & 15 deletions tests/phpunit/tests/user/query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,8 +1982,8 @@ public function test_get_single_capability_multisite_blog_id() {
public function test_returning_fields( $field, $expected_values ) {
$q = new WP_User_Query(
array(
'fields' => $field,
'include ' => array( self::$admin_ids[0] ),
'fields' => $field,
'include' => array( '1' ),
)
);
$results = $q->get_results();
Expand All @@ -2007,68 +2007,94 @@ public function test_returning_fields( $field, $expected_values ) {

public function data_returning_fields() {
return array(
'all' => array(
'all' => array(
'field' => 'all',
'expected' => array(
'ID' => '1',
'user_login' => 'admin',
'user_nicename' => 'admin',
'user_email' => '[email protected]',
'user_url' => 'http://example.org',
'user_email' => WP_TESTS_EMAIL,
'user_url' => wp_guess_url(),
'user_activation_key' => '',
'user_status' => '0',
'display_name' => 'admin',
),
),
'all_with_meta' => array(
'all_with_meta' => array(
'field' => 'all_with_meta',
'expected' => array(
'ID' => '1',
'user_login' => 'admin',
'user_nicename' => 'admin',
'user_email' => '[email protected]',
'user_url' => 'http://example.org',
'user_email' => WP_TESTS_EMAIL,
'user_url' => wp_guess_url(),
'user_activation_key' => '',
'user_status' => '0',
'display_name' => 'admin',
),
),
'ID' => array(
'ID' => array(
'field' => 'ID',
'expected' => array(
'ID' => '1',
),
),
'display_name' => array(
'id' => array(
'field' => 'id',
'expected' => array(
'ID' => '1',
),
),
'display_name' => array(
'field' => 'display_name',
'expected' => array(
'display_name' => 'admin',
),
),
'user_login' => array(
'user_login' => array(
'field' => 'user_login',
'expected' => array(
'user_login' => 'admin',
),
),
'user_nicename' => array(
'user_nicename' => array(
'field' => 'user_nicename',
'expected' => array(
'user_nicename' => 'admin',
),
),
'user_email' => array(
'user_email' => array(
'field' => 'user_email',
'expected' => array(
'user_email' => '[email protected]',
'user_email' => WP_TESTS_EMAIL,
),
),
'invalid_field' => array(
'invalid_field' => array(
'field' => 'invalid_field',
'expected' => array(
'0' => '1',
),
),
'valid_array' => array(
'field' => array( 'ID', 'display_name' ),
'expected' => array(
'ID' => '1',
'display_name' => 'admin',
),
),
'semivalid_array' => array(
'field' => array( 'ID', 'display_name', 'invalid_field' ),
'expected' => array(
'ID' => '1',
'display_name' => 'admin',
),
),
'invalid_array' => array(
'field' => array( 'invalid_field' ),
'expected' => array(
'ID' => '1',
),
),
);
}

Expand Down