<!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>[59766] trunk: Query: Increase `WP_Query` cache hits for equivalent arguments.</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/59766">59766</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/59766","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>2025-02-06 05:02:17 +0000 (Thu, 06 Feb 2025)</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'>Query: Increase `WP_Query` cache hits for equivalent arguments.
Introduces normalization a number of arguments passed to `WP_Query` to increase cache hits for equivalent requests. For example `author__in => [ 1, 2 ]` and `author__in => [ 2, 1 ]` will now hit the same cache.
Prior to generating the SQL request and cache key, the following are sorted, made unique and type cast as appropriate.
* `post_type` when passed as an array
* `post_status` when passed as an array
* `term_query`s containing `terms`
* `cat`
* `category__in`
* `category__not_in`
* `category__and`
* `tag_slug__in`
* `tag__in`
* `tag__not_in`
* `tag__and`
* `tag_slug__in`
* `tag_slug__and`
* `post_parent__not_in`
* `author`
* `author__not_in`
* `author__in`
The following are sorted for the purposes of generating the cache key and SQL `WHERE` clause but unmodified for use in the `ORDER BY` SQL clause:
* `post_name__in`
* `post__in`
* `post_parent__in`
This commit includes changes to unrelated tests, assertions in `Tests_Query_ParseQuery::test_parse_query_cat_array_mixed()` and `WP_Test_REST_Posts_Controller::test_get_items_not_sticky_with_exclude()` have been modified to account for the sorting of the items above.
Props thekt12, peterwilsoncc, spacedmonkey, joemcgill, flixos90, mukesh27, pbearne, swissspidy.
Fixes <a href="https://core.trac.wordpress.org/ticket/59516">#59516</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunktestsphpunittestsquerycacheResultsphp">trunk/tests/phpunit/tests/query/cacheResults.php</a></li>
<li><a href="#trunktestsphpunittestsqueryparseQueryphp">trunk/tests/phpunit/tests/query/parseQuery.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpqueryphp"></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-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2025-02-05 23:51:28 UTC (rev 59765)
+++ trunk/src/wp-includes/class-wp-query.php 2025-02-06 05:02:17 UTC (rev 59766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,6 +475,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
</span><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">+ * The cache key generated by the query.
+ *
+ * The cache key is generated by the method ::generate_cache_key() after the
+ * query has been normalized.
+ *
+ * @var string
+ */
+ private $query_cache_key = '';
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Resets query flags to false.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The query flags are what page info WordPress was able to figure out.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1101,7 +1111,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $qv['post_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $qv['post_type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qv['post_type'] = array_map( 'sanitize_key', $qv['post_type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qv['post_type'] = array_map( 'sanitize_key', array_unique( $qv['post_type'] ) );
+ sort( $qv['post_type'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $qv['post_type'] = sanitize_key( $qv['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,7 +1120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $qv['post_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $qv['post_status'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qv['post_status'] = array_map( 'sanitize_key', $qv['post_status'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qv['post_status'] = array_map( 'sanitize_key', array_unique( $qv['post_status'] ) );
+ sort( $qv['post_status'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $qv['post_status'] = preg_replace( '|[^a-z0-9_,-]|', '', $qv['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,9 +1194,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = $q[ $t->query_var ];
</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 ( is_array( $term ) ) {
- $term = implode( ',', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $term ) ) {
+ $term = explode( ',', $term );
+ $term = array_map( 'trim', $term );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $term );
+ $term = implode( ',', $term );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_contains( $term, '+' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = preg_split( '/[+]+/', $term );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1220,7 +1235,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_array = preg_split( '/[,\s]+/', urldecode( $q['cat'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_array = array_map( 'intval', $cat_array );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $q['cat'] = implode( ',', $cat_array );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $cat_array );
+ $q['cat'] = implode( ',', $cat_array );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cat_array as $cat ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cat > 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1262,7 +1278,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['category__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['category__in'] );
+ $tax_query[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['category__in'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1272,6 +1289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['category__not_in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['category__not_in'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax_query[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['category__not_in'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1282,7 +1300,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['category__and'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['category__and'] );
+ $tax_query[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['category__and'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1300,10 +1319,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_contains( $q['tag'], ',' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Handle normalizing `tag` query string.
</ins><span class="cx" style="display: block; padding: 0 10px"> $tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tags as $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = sanitize_term_field( 'slug', $tag, 0, 'post_tag', 'db' );
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag_slug__in'][] = $tag;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag_slug__in'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = preg_split( '/[+\r\n\t ]+/', $q['tag'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1314,6 +1335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag'] = sanitize_term_field( 'slug', $q['tag'], 0, 'post_tag', 'db' );
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag_slug__in'][] = $q['tag'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag_slug__in'] );
</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">@@ -1327,7 +1349,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['tag__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag__in'] = array_map( 'absint', array_unique( (array) $q['tag__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag__in'] );
+ $tax_query[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['tag__in'],
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1335,6 +1358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['tag__not_in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag__not_in'] = array_map( 'absint', array_unique( (array) $q['tag__not_in'] ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag__not_in'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax_query[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['tag__not_in'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1344,7 +1368,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['tag__and'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag__and'] = array_map( 'absint', array_unique( (array) $q['tag__and'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag__and'] );
+ $tax_query[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['tag__and'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'operator' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1353,7 +1378,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['tag_slug__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag_slug__in'] = array_map( 'sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag_slug__in'] );
+ $tax_query[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['tag_slug__in'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'slug',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1362,7 +1388,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['tag_slug__and'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag_slug__and'] = array_map( 'sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['tag_slug__and'] );
+ $tax_query[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => $q['tag_slug__and'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'slug',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2186,8 +2213,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
- $where .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Duplicate array before sorting to allow for the orderby clause.
+ $post_name__in_for_where = array_unique( $q['post_name__in'] );
+ sort( $post_name__in_for_where );
+ $post_name__in = "'" . implode( "','", $post_name__in_for_where ) . "'";
+ $where .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
</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"> // If an attachment is requested by number, let it supersede any post number.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2199,9 +2229,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['p'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.ID = " . $q['p'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post__in'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post__in = implode( ',', array_map( 'absint', $q['post__in'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Duplicate array before sorting to allow for the orderby clause.
+ $post__in_for_where = $q['post__in'];
+ $post__in_for_where = array_unique( array_map( 'absint', $post__in_for_where ) );
+ sort( $post__in_for_where );
+ $post__in = implode( ',', array_map( 'absint', $post__in_for_where ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.ID IN ($post__in)";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post__not_in'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['post__not_in'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post__not_in = implode( ',', array_map( 'absint', $q['post__not_in'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2209,9 +2244,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $q['post_parent'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_parent = %d ", $q['post_parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post_parent__in'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Duplicate array before sorting to allow for the orderby clause.
+ $post_parent__in_for_where = $q['post_parent__in'];
+ $post_parent__in_for_where = array_unique( array_map( 'absint', $post_parent__in_for_where ) );
+ sort( $post_parent__in_for_where );
+ $post_parent__in = implode( ',', array_map( 'absint', $post_parent__in_for_where ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post_parent__not_in'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q['post_parent__not_in'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_parent__not_in = implode( ',', array_map( 'absint', $q['post_parent__not_in'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2341,6 +2381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['author'] ) && '0' != $q['author'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $authors );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $authors as $author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = $author > 0 ? 'author__in' : 'author__not_in';
</span><span class="cx" style="display: block; padding: 0 10px"> $q[ $key ][] = abs( $author );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2349,9 +2390,17 @@
</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 ( ! empty( $q['author__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $q['author__not_in'] ) ) {
+ $q['author__not_in'] = array_unique( array_map( 'absint', $q['author__not_in'] ) );
+ sort( $q['author__not_in'] );
+ }
+ $author__not_in = implode( ',', (array) $q['author__not_in'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $q['author__in'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $q['author__in'] ) ) {
+ $q['author__in'] = array_unique( array_map( 'absint', $q['author__in'] ) );
+ sort( $q['author__in'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2588,6 +2637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $q_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q_status = explode( ',', $q_status );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $q_status );
</ins><span class="cx" style="display: block; padding: 0 10px"> $r_status = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $p_status = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $e_status = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4902,6 +4952,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort post types to ensure same cache key generation.
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $args['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Sort arrays that can be used for ordering prior to cache key generation.
+ *
+ * These arrays are sorted in the query generator for the purposes of the
+ * WHERE clause but the arguments are not modified as they can be used for
+ * the orderby clase.
+ *
+ * Their use in the orderby clause will generate a different SQL query so
+ * they can be sorted for the cache key generation.
+ */
+ $sortable_arrays_with_int_values = array(
+ 'post__in',
+ 'post_parent__in',
+ );
+ foreach ( $sortable_arrays_with_int_values as $key ) {
+ if ( isset( $args[ $key ] ) && is_array( $args[ $key ] ) ) {
+ $args[ $key ] = array_unique( array_map( 'absint', $args[ $key ] ) );
+ sort( $args[ $key ] );
+ }
+ }
+
+ // Sort and unique the 'post_name__in' for cache key generation.
+ if ( isset( $args['post_name__in'] ) && is_array( $args['post_name__in'] ) ) {
+ $args['post_name__in'] = array_unique( $args['post_name__in'] );
+ sort( $args['post_name__in'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['post_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['post_status'] = (array) $args['post_status'];
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort post status to ensure same cache key generation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4942,7 +5019,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_changed .= wp_cache_get_last_changed( 'terms' );
</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">- return "wp_query:$key:$last_changed";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_cache_key = "wp_query:$key:$last_changed";
+ return $this->query_cache_key;
</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="trunktestsphpunittestsquerycacheResultsphp"></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/query/cacheResults.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/cacheResults.php 2025-02-05 23:51:28 UTC (rev 59765)
+++ trunk/tests/phpunit/tests/query/cacheResults.php 2025-02-06 05:02:17 UTC (rev 59766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,174 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 59516
+ *
+ * @covers WP_Query::generate_cache_key
+ */
+ public function test_post_in_order_by_clauses_are_not_normalized() {
+ global $wpdb;
+
+ $post_ids = self::$posts;
+
+ $query_vars1 = array(
+ 'post__in' => $post_ids,
+ 'orderby' => 'post__in',
+ );
+ $query_vars2 = array(
+ 'post__in' => array_reverse( $post_ids ),
+ 'orderby' => 'post__in',
+ );
+
+ $fields = "{$wpdb->posts}.ID";
+ $query1 = new WP_Query( $query_vars1 );
+ $request1 = str_replace( $fields, "{$wpdb->posts}.*", $query1->request );
+
+ $query2 = new WP_Query( $query_vars2 );
+ $request2 = str_replace( $fields, "{$wpdb->posts}.*", $query2->request );
+
+ $reflection_q1 = new ReflectionProperty( $query1, 'query_cache_key' );
+ $reflection_q1->setAccessible( true );
+
+ $reflection_q2 = new ReflectionProperty( $query2, 'query_cache_key' );
+ $reflection_q2->setAccessible( true );
+
+ $this->assertNotSame( $request1, $request2, 'Queries should not match' );
+
+ $cache_key_1 = $reflection_q1->getValue( $query1 );
+ $cache_key_2 = $reflection_q2->getValue( $query2 );
+
+ $this->assertNotSame( $cache_key_1, $cache_key_2, 'Cache key should differ.' );
+ $this->assertNotEmpty( $cache_key_1, 'Cache key for query one should not be empty.' );
+ $this->assertNotEmpty( $cache_key_2, 'Cache key for query two should not be empty.' );
+
+ // Test the posts are returned different orders.
+ $this->assertNotSame( wp_list_pluck( $query1->posts, 'ID' ), wp_list_pluck( $query2->posts, 'ID' ), 'Query one posts should not match the order of query two posts.' );
+ // Test the posts are the same sets.
+ $this->assertSameSets( wp_list_pluck( $query1->posts, 'ID' ), wp_list_pluck( $query2->posts, 'ID' ), 'Query one posts should match the set of query two posts.' );
+ }
+
+ /**
+ * @ticket 59516
+ *
+ * @covers WP_Query::generate_cache_key
+ */
+ public function test_post_parent_in_order_by_clauses_are_not_normalized() {
+ global $wpdb;
+
+ $parent_pages = self::$pages;
+ $post_names = array( 'doctor-dillamond', 'elphaba', 'fiyero', 'glinda', 'the-wizard-of-oz' );
+ $child_pages = array();
+ foreach ( $parent_pages as $key => $parent_page ) {
+ $child_pages[] = self::factory()->post->create(
+ array(
+ 'post_parent' => $parent_page,
+ 'post_type' => 'page',
+ 'post_name' => $post_names[ $key ],
+ )
+ );
+ }
+
+ $query_vars1 = array(
+ 'post_parent__in' => $parent_pages,
+ 'post_type' => 'page',
+ 'orderby' => 'post_parent__in',
+ );
+
+ $query_vars2 = array(
+ 'post_parent__in' => array_reverse( $parent_pages ),
+ 'post_type' => 'page',
+ 'orderby' => 'post_parent__in',
+ );
+
+ $fields = "{$wpdb->posts}.ID";
+ $query1 = new WP_Query( $query_vars1 );
+ $request1 = str_replace( $fields, "{$wpdb->posts}.*", $query1->request );
+
+ $query2 = new WP_Query( $query_vars2 );
+ $request2 = str_replace( $fields, "{$wpdb->posts}.*", $query2->request );
+
+ $reflection_q1 = new ReflectionProperty( $query1, 'query_cache_key' );
+ $reflection_q1->setAccessible( true );
+
+ $reflection_q2 = new ReflectionProperty( $query2, 'query_cache_key' );
+ $reflection_q2->setAccessible( true );
+
+ $this->assertNotSame( $request1, $request2, 'Queries should not match' );
+
+ $cache_key_1 = $reflection_q1->getValue( $query1 );
+ $cache_key_2 = $reflection_q2->getValue( $query2 );
+
+ $this->assertNotSame( $cache_key_1, $cache_key_2, 'Cache key should differ.' );
+ $this->assertNotEmpty( $cache_key_1, 'Cache key for query one should not be empty.' );
+ $this->assertNotEmpty( $cache_key_2, 'Cache key for query two should not be empty.' );
+
+ // Test the posts are returned in the correct order.
+ $this->assertSame( array( 'doctor-dillamond', 'elphaba', 'fiyero', 'glinda', 'the-wizard-of-oz' ), wp_list_pluck( $query1->posts, 'post_name' ), 'Query one posts should be in alphabetical order' );
+ $this->assertSame( array( 'the-wizard-of-oz', 'glinda', 'fiyero', 'elphaba', 'doctor-dillamond' ), wp_list_pluck( $query2->posts, 'post_name' ), 'Query two posts should be in reverse alphabetical order.' );
+ // Test the posts are the same sets.
+ $this->assertSameSets( wp_list_pluck( $query1->posts, 'ID' ), wp_list_pluck( $query2->posts, 'ID' ), 'Query one posts should match the set of query two posts.' );
+ }
+
+ /**
+ * @ticket 59516
+ *
+ * @covers WP_Query::generate_cache_key
+ */
+ public function test_post_name_in_order_by_clauses_are_not_normalized() {
+ global $wpdb;
+ $post_names = array( 'doctor-dillamond', 'elphaba', 'glinda', 'the-wizard-of-oz' );
+ $posts = array();
+
+ foreach ( $post_names as $post_name ) {
+ $posts[] = self::factory()->post->create(
+ array(
+ 'post_name' => $post_name,
+ )
+ );
+ }
+
+ $query_vars1 = array(
+ 'post_name__in' => $post_names,
+ 'orderby' => 'post_name__in',
+ );
+
+ $query_vars2 = array(
+ 'post_name__in' => array_reverse( $post_names ),
+ 'orderby' => 'post_name__in',
+ );
+
+ $fields = "{$wpdb->posts}.ID";
+ $query1 = new WP_Query( $query_vars1 );
+ $request1 = str_replace( $fields, "{$wpdb->posts}.*", $query1->request );
+
+ $query2 = new WP_Query( $query_vars2 );
+ $request2 = str_replace( $fields, "{$wpdb->posts}.*", $query2->request );
+
+ $reflection_q1 = new ReflectionProperty( $query1, 'query_cache_key' );
+ $reflection_q1->setAccessible( true );
+
+ $reflection_q2 = new ReflectionProperty( $query2, 'query_cache_key' );
+ $reflection_q2->setAccessible( true );
+
+ $this->assertNotSame( $request1, $request2, 'Queries should not match' );
+
+ $cache_key_1 = $reflection_q1->getValue( $query1 );
+ $cache_key_2 = $reflection_q2->getValue( $query2 );
+
+ $this->assertNotSame( $cache_key_1, $cache_key_2, 'Cache key should differ.' );
+ $this->assertNotEmpty( $cache_key_1, 'Cache key for query one should not be empty.' );
+ $this->assertNotEmpty( $cache_key_2, 'Cache key for query two should not be empty.' );
+
+ // Test the posts are returned in the correct order.
+ $this->assertSame( array( 'doctor-dillamond', 'elphaba', 'glinda', 'the-wizard-of-oz' ), wp_list_pluck( $query1->posts, 'post_name' ), 'Query one posts should be in alphabetical order' );
+ $this->assertSame( array( 'the-wizard-of-oz', 'glinda', 'elphaba', 'doctor-dillamond' ), wp_list_pluck( $query2->posts, 'post_name' ), 'Query two posts should be in reverse alphabetical order.' );
+ // Test the posts are the same sets.
+ $this->assertSameSets( wp_list_pluck( $query1->posts, 'ID' ), wp_list_pluck( $query2->posts, 'ID' ), 'Query one posts should match the set of query two posts.' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 59442
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 59516
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Query::generate_cache_key
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,15 +384,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query2 = new WP_Query( $query_vars2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $request2 = str_replace( $fields, "{$wpdb->posts}.*", $query2->request );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $reflection = new ReflectionMethod( $query1, 'generate_cache_key' );
- $reflection->setAccessible( true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reflection_q1 = new ReflectionProperty( $query1, 'query_cache_key' );
+ $reflection_q1->setAccessible( true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reflection_q2 = new ReflectionProperty( $query2, 'query_cache_key' );
+ $reflection_q2->setAccessible( true );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $request1, $request2, 'Queries should match' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache_key_1 = $reflection->invoke( $query1, $query_vars1, $request1 );
- $cache_key_2 = $reflection->invoke( $query1, $query_vars2, $request2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key_1 = $reflection_q1->getValue( $query1 );
+ $cache_key_2 = $reflection_q2->getValue( $query2 );
</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( $cache_key_1, $cache_key_2, 'Cache key differs the same paramters.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $cache_key_1, $cache_key_2, 'Cache key differs the same effective parameters.' );
+ $this->assertNotEmpty( $cache_key_1, 'Cache key for query one should not be empty.' );
+ $this->assertNotEmpty( $cache_key_2, 'Cache key for query two should not be empty.' );
</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">@@ -280,19 +452,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_query_cache_duplicate() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post type empty' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post type empty' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_type' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_type' => 'post' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post type array' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post type array' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_type' => array( 'page' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_type' => 'page' ),
</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 empty' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'orderby empty' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'orderby' => null ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'orderby' => 'date' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'different order parameter' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'different order parameter' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 15,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,32 +474,242 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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">- 'same args' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'same args' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_type' => 'post' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_type' => 'post' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'same args any' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'same args any' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_type' => 'any' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_type' => 'any' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'any and post types' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'any and post types' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_type' => 'any' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_type' => array( 'post', 'page', 'attachment' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'different order post type' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'different order post type' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_type' => array( 'post', 'page' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_type' => array( 'page', 'post' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post status array' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'non-unique post type' => array(
+ 'query_vars1' => array( 'post_type' => array( 'post', 'page' ) ),
+ 'query_vars2' => array( 'post_type' => array( 'page', 'post', 'page' ) ),
+ ),
+ 'post status array' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_status' => 'publish' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_status' => array( 'publish' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post status order' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post status order' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array( 'post_status' => array( 'draft', 'publish' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_vars2' => array( 'post_status' => array( 'publish', 'draft' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cache parameters' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'non-unique post status' => array(
+ 'query_vars1' => array( 'post_status' => array( 'draft', 'publish' ) ),
+ 'query_vars2' => array( 'post_status' => array( 'draft', 'publish', 'draft' ) ),
+ ),
+ 'post id int vs string' => array(
+ 'query_vars1' => array( 'p' => '1' ),
+ 'query_vars2' => array( 'p' => 1 ),
+ ),
+ 'page id int vs string' => array(
+ 'query_vars1' => array( 'page_id' => '2' ),
+ 'query_vars2' => array( 'page_id' => 2 ),
+ ),
+ 'attachment id int vs string' => array(
+ 'query_vars1' => array( 'attachment_id' => '3' ),
+ 'query_vars2' => array( 'attachment_id' => 3 ),
+ ),
+ 'date and time values int vs string' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_vars1' => array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'year' => '2013',
+ 'monthnum' => '12',
+ 'day' => '12',
+ 'hour' => '12',
+ 'minute' => '12',
+ 'second' => '12',
+ ),
+ 'query_vars2' => array(
+ 'year' => 2013,
+ 'monthnum' => 12,
+ 'day' => 12,
+ 'hour' => 12,
+ 'minute' => 12,
+ 'second' => 12,
+ ),
+ ),
+ 'offset value int vs string' => array(
+ 'query_vars1' => array( 'offset' => '5' ),
+ 'query_vars2' => array( 'offset' => 5 ),
+ ),
+ 'posts per page value int vs string' => array(
+ 'query_vars1' => array( 'posts_per_page' => '5' ),
+ 'query_vars2' => array( 'posts_per_page' => 5 ),
+ ),
+ 'paged value int vs string' => array(
+ 'query_vars1' => array( 'paged' => '2' ),
+ 'query_vars2' => array( 'paged' => 2 ),
+ ),
+ 'menu_order value int vs string' => array(
+ 'query_vars1' => array( 'menu_order' => '2' ),
+ 'query_vars2' => array( 'menu_order' => 2 ),
+ ),
+ 'post__in different order' => array(
+ 'query_vars1' => array( 'post__in' => array( 1, 2, 3, 4, 5 ) ),
+ 'query_vars2' => array( 'post__in' => array( 5, 4, 3, 2, 1 ) ),
+ ),
+ 'post__in non-unique' => array(
+ 'query_vars1' => array( 'post__in' => array( 1, 2, 3, 4, 5 ) ),
+ 'query_vars2' => array( 'post__in' => array( 1, 2, 3, 4, 5, 1, 2, 3 ) ),
+ ),
+ 'post_parent__in different order' => array(
+ 'query_vars1' => array( 'post_parent__in' => array( 1, 2, 3, 4, 5 ) ),
+ 'query_vars2' => array( 'post_parent__in' => array( 5, 4, 3, 2, 1 ) ),
+ ),
+ 'post_parent__in non-unique' => array(
+ 'query_vars1' => array( 'post_parent__in' => array( 1, 2, 3, 4, 5 ) ),
+ 'query_vars2' => array( 'post_parent__in' => array( 1, 2, 3, 4, 5, 1, 2, 3 ) ),
+ ),
+ 'post_name__in different order' => array(
+ 'query_vars1' => array( 'post_name__in' => array( 'elphaba', 'glinda', 'the-wizard-of-oz', 'doctor-dillamond' ) ),
+ 'query_vars2' => array( 'post_name__in' => array( 'doctor-dillamond', 'elphaba', 'the-wizard-of-oz', 'glinda' ) ),
+ ),
+ 'post_name__in non-unique' => array(
+ 'query_vars1' => array( 'post_name__in' => array( 'elphaba', 'glinda', 'the-wizard-of-oz', 'doctor-dillamond' ) ),
+ 'query_vars2' => array( 'post_name__in' => array( 'elphaba', 'glinda', 'elphaba', 'glinda', 'the-wizard-of-oz', 'doctor-dillamond' ) ),
+ ),
+ 'cat different order (array)' => array(
+ 'query_vars_1' => array( 'cat' => array( '1', '2' ) ),
+ 'query_vars_2' => array( 'cat' => array( '2', '1' ) ),
+ ),
+ 'cat different order (string)' => array(
+ 'query_vars_1' => array( 'cat' => '2,1' ),
+ 'query_vars_2' => array( 'cat' => '1,2' ),
+ ),
+ 'cat queries int vs string' => array(
+ 'query_vars_1' => array( 'cat' => '2' ),
+ 'query_vars_2' => array( 'cat' => 2 ),
+ ),
+ 'category__in queries different order (array)' => array(
+ 'query_vars_1' => array( 'category__in' => array( '1', '2' ) ),
+ 'query_vars_2' => array( 'category__in' => array( '2', '1' ) ),
+ ),
+ 'category__in queries with non-unique array' => array(
+ 'query_vars_1' => array( 'category__in' => array( '1', '1' ) ),
+ 'query_vars_2' => array( 'category__in' => array( '1' ) ),
+ ),
+ 'category__in queries string vs array (array)' => array(
+ 'query_vars_1' => array( 'category__in' => array( '1' ) ),
+ 'query_vars_2' => array( 'category__in' => array( 1 ) ),
+ ),
+ 'category__not_in different order (array)' => array(
+ 'query_vars_1' => array( 'category__not_in' => array( '1', '2' ) ),
+ 'query_vars_2' => array( 'category__not_in' => array( '2', '1' ) ),
+ ),
+ 'category__not_in with non-unique array' => array(
+ 'query_vars_1' => array( 'category__not_in' => array( '1', '1' ) ),
+ 'query_vars_2' => array( 'category__not_in' => array( '1' ) ),
+ ),
+ 'category__not_in queries string vs array (array)' => array(
+ 'query_vars_1' => array( 'category__not_in' => array( '1' ) ),
+ 'query_vars_2' => array( 'category__not_in' => array( 1 ) ),
+ ),
+ 'category__and queries width different order (array)' => array(
+ 'query_vars_1' => array( 'category__and' => array( '1', '2' ) ),
+ 'query_vars_2' => array( 'category__and' => array( '2', '1' ) ),
+ ),
+ 'category__and with non-unique array' => array(
+ 'query_vars_1' => array( 'category__and' => array( '1', '1', '2' ) ),
+ 'query_vars_2' => array( 'category__and' => array( '1', '2' ) ),
+ ),
+ 'category__and queries string vs array (array)' => array(
+ 'query_vars_1' => array( 'category__and' => array( '1', '2' ) ),
+ 'query_vars_2' => array( 'category__and' => array( 1, 2 ) ),
+ ),
+ 'author queries different order (string)' => array(
+ 'query_vars_1' => array( 'author' => '1,2' ),
+ 'query_vars_2' => array( 'author' => '2,1' ),
+ ),
+ 'author with non-unique string' => array(
+ 'query_vars_1' => array( 'author' => '1,1' ),
+ 'query_vars_2' => array( 'author' => '1' ),
+ ),
+ 'author queries int vs string (string)' => array(
+ 'query_vars_1' => array( 'author' => 1 ),
+ 'query_vars_2' => array( 'author' => '1' ),
+ ),
+ 'author queries int vs string (array)' => array(
+ 'query_vars_1' => array( 'author' => array( 1 ) ),
+ 'query_vars_2' => array( 'author' => array( '1' ) ),
+ ),
+ 'author__in different order' => array(
+ 'query_vars_1' => array( 'author__in' => array( 1, 2 ) ),
+ 'query_vars_2' => array( 'author__in' => array( 2, 1 ) ),
+ ),
+ 'author__in with non-unique array' => array(
+ 'query_vars_1' => array( 'author__in' => array( 1, 1, 2 ) ),
+ 'query_vars_2' => array( 'author__in' => array( 1, 2 ) ),
+ ),
+ 'author__in queries int vs string (array)' => array(
+ 'query_vars_1' => array( 'author__in' => array( 1 ) ),
+ 'query_vars_2' => array( 'author__in' => array( '1' ) ),
+ ),
+ 'author__not_in different order (array)' => array(
+ 'query_vars_1' => array( 'author__not_in' => array( 1, 2 ) ),
+ 'query_vars_2' => array( 'author__not_in' => array( 2, 1 ) ),
+ ),
+ 'author__not_in queries int vs string (array)' => array(
+ 'query_vars_1' => array( 'author__not_in' => array( 1 ) ),
+ 'query_vars_2' => array( 'author__not_in' => array( '1' ) ),
+ ),
+ 'tag_slug__in order' => array(
+ 'query_vars_1' => array( 'tag_slug__in' => array( 'foo', 'bar' ) ),
+ 'query_vars_2' => array( 'tag_slug__in' => array( 'bar', 'foo' ) ),
+ ),
+ 'tag_slug__in non-unique vs unique' => array(
+ 'query_vars_1' => array( 'tag_slug__in' => array( 'foo', 'bar', 'bar' ) ),
+ 'query_vars_2' => array( 'tag_slug__in' => array( 'foo', 'bar' ) ),
+ ),
+ 'tag_slug__and order' => array(
+ 'query_vars_1' => array( 'tag_slug__and' => array( 'foo', 'bar' ) ),
+ 'query_vars_2' => array( 'tag_slug__and' => array( 'bar', 'foo' ) ),
+ ),
+ 'tag_slug__and non-unique' => array(
+ 'query_vars_1' => array( 'tag_slug__and' => array( 'foo', 'bar', 'foo' ) ),
+ 'query_vars_2' => array( 'tag_slug__and' => array( 'bar', 'foo' ) ),
+ ),
+ 'tag__in queries different order (array)' => array(
+ 'query_vars_1' => array( 'tag__in' => array( 1, 2 ) ),
+ 'query_vars_2' => array( 'tag__in' => array( 2, 1 ) ),
+ ),
+ 'tag__in queries non-unique array' => array(
+ 'query_vars_1' => array( 'tag__in' => array( 1, 2, 1 ) ),
+ 'query_vars_2' => array( 'tag__in' => array( 2, 1 ) ),
+ ),
+ 'tag__in queries int vs string' => array(
+ 'query_vars_1' => array( 'tag__in' => array( 2, 1 ) ),
+ 'query_vars_2' => array( 'tag__in' => array( '2', '1' ) ),
+ ),
+ 'tag__and queries different order (array)' => array(
+ 'query_vars_1' => array( 'tag__and' => array( 1, 2 ) ),
+ 'query_vars_2' => array( 'tag__and' => array( 2, 1 ) ),
+ ),
+ 'tag__and queries non-unique array' => array(
+ 'query_vars_1' => array( 'tag__and' => array( 1, 2, 2 ) ),
+ 'query_vars_2' => array( 'tag__and' => array( 2, 1 ) ),
+ ),
+ 'tag__not_in queries different order (array)' => array(
+ 'query_vars_1' => array( 'tag__not_in' => array( 1, 2 ) ),
+ 'query_vars_2' => array( 'tag__not_in' => array( 2, 1 ) ),
+ ),
+ 'tag__not_in queries non-unique array' => array(
+ 'query_vars_1' => array( 'tag__not_in' => array( 1, 2, 2 ) ),
+ 'query_vars_2' => array( 'tag__not_in' => array( 1, 2 ) ),
+ ),
+ 'tag__not_in queries int vs string (array)' => array(
+ 'query_vars_1' => array( 'tag__not_in' => array( '1' ) ),
+ 'query_vars_2' => array( 'tag__not_in' => array( 1 ) ),
+ ),
+ 'cache parameters' => array(
+ 'query_vars1' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_post_meta_cache' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_post_term_cache' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_menu_item_cache' => true,
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryparseQueryphp"></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/query/parseQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/parseQuery.php 2025-02-05 23:51:28 UTC (rev 59765)
+++ trunk/tests/phpunit/tests/query/parseQuery.php 2025-02-06 05:02:17 UTC (rev 59766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '1,-1', $q->query_vars['cat'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '-1,1', $q->query_vars['cat'] );
</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="trunktestsphpunittestsrestapirestpostscontrollerphp"></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/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2025-02-05 23:51:28 UTC (rev 59765)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2025-02-06 05:02:17 UTC (rev 59766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1574,7 +1574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( $id2, $ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( $id3, $ids );
</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->assertPostsWhere( " AND {posts}.ID NOT IN ($id3,$id2) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsWhere( " AND {posts}.ID NOT IN ($id2,$id3) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
</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_get_items_not_sticky_with_exclude_no_sticky_posts() {
</span></span></pre>
</div>
</div>
</body>
</html>