Query: Be better at forcing data types for query vars.

Several query vars only accept a scalar value and pass the value through functions that assume a scalar value. Adding extra guard conditions to the types of query vars doesn't affect their functionality but does remove PHP notices and warnings that can otherwise be generated when a non-scalar value such as an array is present in a query var.

Props juliobox, xknown, SergeyBiryukov, dave1010, nacin, tellyworth, dd32, audrasjb, johnregan3

Fixes #17737


git-svn-id: https://develop.svn.wordpress.org/trunk@53891 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2022-08-13 22:29:19 +00:00
parent d1e22dbad8
commit 01c9ea7540
2 changed files with 159 additions and 18 deletions

View File

@@ -104,4 +104,133 @@ class Tests_Query_ParseQuery extends WP_UnitTestCase {
$this->assertSame( '404', $q->query_vars['error'] );
}
/**
* Ensure an array of authors is rejected.
*
* @ticket 17737
*/
public function test_parse_query_author_array() {
$q = new WP_Query();
$q->parse_query(
array(
'author' => array( 1, 2, 3 ),
)
);
$this->assertEmpty( $q->query_vars['author'] );
}
/**
* Ensure a non-scalar (non-numeric) author value is rejected.
*
* @ticket 17737
*/
public function test_parse_query_author_string() {
$q = new WP_Query();
$q->parse_query(
array(
'author' => 'admin',
)
);
$this->assertEmpty( $q->query_vars['author'] );
}
/**
* Ensure nonscalar 'cat' array values are rejected.
*
* Note the returned 'cat' query_var value is a string.
*
* @ticket 17737
*/
public function test_parse_query_cat_array_mixed() {
$q = new WP_Query();
$q->parse_query(
array(
'cat' => array( 1, 'uncategorized', '-1' ),
)
);
$this->assertSame( '1,-1', $q->query_vars['cat'] );
}
/**
* Ensure a nonscalar menu_order value is rejected.
*
* @ticket 17737
*/
public function test_parse_query_menu_order_nonscalar() {
$q = new WP_Query();
$q->parse_query(
array(
'menu_order' => array( 1 ),
)
);
$this->assertEmpty( $q->query_vars['menu_order'] );
}
/**
* Ensure numeric 'subpost' gets assigned to 'attachment'.
*
* @ticket 17737
*/
public function test_parse_query_subpost_scalar() {
$q = new WP_Query();
$q->parse_query(
array(
'subpost' => 1,
)
);
$this->assertSame( 1, $q->query_vars['attachment'] );
}
/**
* Ensure non-scalar 'subpost' does not get assigned to 'attachment'.
*
* @ticket 17737
*/
public function test_parse_query_subpost_nonscalar() {
$q = new WP_Query();
$q->parse_query(
array(
'subpost' => array( 1 ),
)
);
$this->assertEmpty( $q->query_vars['attachment'] );
}
/**
* Ensure numeric 'attachment_id' value is assigned.
*
* @ticket 17737
*/
public function test_parse_query_attachment_id() {
$q = new WP_Query();
$q->parse_query(
array(
'attachment_id' => 1,
)
);
$this->assertSame( 1, $q->query_vars['attachment_id'] );
}
/**
* Ensure non-scalar 'attachment_id' value is rejected.
*
* @ticket 17737
*/
public function test_parse_query_attachment_id_nonscalar() {
$q = new WP_Query();
$q->parse_query(
array(
'attachment_id' => array( 1 ),
)
);
$this->assertEmpty( $q->query_vars['attachment_id'] );
}
}