<!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>[40136] branches/4.7: REST API: Fix behavior of `sticky` posts filter when no posts are sticky.</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 { 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/40136">40136</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/40136","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-27 19:53:43 +0000 (Mon, 27 Feb 2017)</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'>REST API: Fix behavior of `sticky` posts filter when no posts are sticky.
Previously, when getting posts from the API with `sticky=true`, if there were no sticky posts set, the query would return all posts as if the `sticky` argument was not set. In this situation, the query should return an empty array instead.
A `sticky=true` query that should return an empty array (in the previous situation, or with `include` and no intersecting post IDs) was also broken in that it would query the post with ID 1.
Finally, this commit significantly improves test coverage for the `sticky` filter argument, including direct testing of the `WHERE` clauses generated by `WP_Query`.
Merge of <a href="https://core.trac.wordpress.org/changeset/40037">[40037]</a> and <a href="https://core.trac.wordpress.org/changeset/40122">[40122]</a> to the 4.7 branch.
Props ryelle, jnylen0.
See <a href="https://core.trac.wordpress.org/ticket/39079">#39079</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/39947">#39947</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesrestapiendpointsclasswprestpostscontrollerphp">branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#branches47testsphpunittestsrestapirestpostscontrollerphp">branches/4.7/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</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/4.7 2017-02-27 19:32:45 UTC (rev 40135)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2017-02-27 19:53:43 UTC (rev 40136)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</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/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036,40039-40041,40045,40049,40055,40058,40061,40063-40066
,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40123-40126,40129-40131
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055,40058,40061,40063-
40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40122-40126,40129-40131
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2017-02-27 19:32:45 UTC (rev 40135)
+++ branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2017-02-27 19:53:43 UTC (rev 40136)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $registered['sticky'], $request['sticky'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sticky_posts = get_option( 'sticky_posts', array() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $sticky_posts && $request['sticky'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $sticky_posts ) ) {
+ $sticky_posts = array();
+ }
+ if ( $request['sticky'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * As post__in will be used to only get sticky posts,
</span><span class="cx" style="display: block; padding: 0 10px"> * we have to support the case where post__in was already
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * so we have to fake it a bit.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $args['post__in'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['post__in'] = array( -1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['post__in'] = array( 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $sticky_posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="branches47testsphpunittestsrestapirestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/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">--- branches/4.7/tests/phpunit/tests/rest-api/rest-posts-controller.php 2017-02-27 19:32:45 UTC (rev 40135)
+++ branches/4.7/tests/phpunit/tests/rest-api/rest-posts-controller.php 2017-02-27 19:53:43 UTC (rev 40136)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $supported_formats;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected $forbidden_cat;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $posts_clauses;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_id = $factory->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +66,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'youseeme', array( 'supports' => array(), 'show_in_rest' => true ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'rest_pre_dispatch', array( $this, 'wpSetUpBeforeRequest' ), 10, 3 );
+ add_filter( 'posts_clauses', array( $this, 'save_posts_clauses' ), 10, 2 );
</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">+ public function wpSetUpBeforeRequest( $result, $server, $request ) {
+ $this->posts_clauses = array();
+ return $result;
+ }
+
+ public function save_posts_clauses( $orderby, $query ) {
+ array_push( $this->posts_clauses, $orderby );
+ return $orderby;
+ }
+
+ public function assertPostsClause( $clause, $pattern ) {
+ global $wpdb;
+ $expected_clause = str_replace( '{posts}', $wpdb->posts, $pattern );
+ $this->assertCount( 1, $this->posts_clauses );
+ $this->assertEquals( $expected_clause, $this->posts_clauses[0][ $clause ] );
+ }
+
+ public function assertPostsOrderedBy( $pattern ) {
+ $this->assertPostsClause( 'orderby', $pattern );
+ }
+
+ public function assertPostsWhere( $pattern ) {
+ $this->assertPostsClause( 'where', $pattern );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $routes = $this->server->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,12 +251,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $data ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id3, $data[0]['id'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsOrderedBy( '{posts}.post_date DESC' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Orderby=>include
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'orderby', 'include' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $data ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id1, $data[0]['id'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsOrderedBy( "FIELD( {posts}.ID, $id1,$id3 )" );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Invalid include should error
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'include', 'invalid' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,11 +467,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Apple Sauce', $data[0]['title']['rendered'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsOrderedBy( '{posts}.post_title DESC' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // order=>asc
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'order', 'asc' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Apple Cobbler', $data[0]['title']['rendered'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsOrderedBy( '{posts}.post_title ASC' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // order=>asc,id should fail
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'order', 'asc,id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,6 +511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id3, $data[0]['id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id2, $data[1]['id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id1, $data[2]['id'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsOrderedBy( '{posts}.ID DESC' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_with_orderby_slug() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,15 +528,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Default ORDER is DESC.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'xyz', $data[0]['slug'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'abc', $data[1]['slug'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertPostsOrderedBy( '{posts}.post_name DESC' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_with_orderby_relevance() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_title' => 'Title is more relevant', 'post_content' => 'Content is', 'post_status' => 'publish' ) );
- $this->factory->post->create( array( 'post_title' => 'Title is', 'post_content' => 'Content is less relevant', 'post_status' => 'publish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id1 = $this->factory->post->create( array( 'post_title' => 'Title is more relevant', 'post_content' => 'Content is', 'post_status' => 'publish' ) );
+ $id2 = $this->factory->post->create( array( 'post_title' => 'Title is', 'post_content' => 'Content is less relevant', 'post_status' => 'publish' ) );
+ $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+ $request->set_param( 'orderby', 'relevance' );
+ $request->set_param( 'search', 'relevant' );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertCount( 2, $data );
+ $this->assertEquals( $id1, $data[0]['id'] );
+ $this->assertEquals( $id2, $data[1]['id'] );
+ $this->assertPostsOrderedBy( '{posts}.post_title LIKE \'%relevant%\' DESC, {posts}.post_date DESC' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_items_with_orderby_relevance_two_terms() {
+ $id1 = $this->factory->post->create( array( 'post_title' => 'Title is more relevant', 'post_content' => 'Content is', 'post_status' => 'publish' ) );
+ $id2 = $this->factory->post->create( array( 'post_title' => 'Title is', 'post_content' => 'Content is less relevant', 'post_status' => 'publish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'orderby', 'relevance' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'search', 'relevant content' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertCount( 2, $data );
+ $this->assertEquals( $id1, $data[0]['id'] );
+ $this->assertEquals( $id2, $data[1]['id'] );
+ $this->assertPostsOrderedBy( '(CASE WHEN {posts}.post_title LIKE \'%relevant content%\' THEN 1 WHEN {posts}.post_title LIKE \'%relevant%\' AND {posts}.post_title LIKE \'%content%\' THEN 2 WHEN {posts}.post_title LIKE \'%relevant%\' OR {posts}.post_title LIKE \'%content%\' THEN 3 WHEN {posts}.post_excerpt LIKE \'%relevant content%\' THEN 4 WHEN {posts}.post_content LIKE \'%relevant content%\' THEN 5 ELSE 6 END), {posts}.post_date DESC' );
+ }
+
+ public function test_get_items_with_orderby_relevance_missing_search() {
+ $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+ $request->set_param( 'orderby', 'relevance' );
+ $response = $this->server->dispatch( $request );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_no_search_term_defined', $response, 400 );
</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">@@ -637,7 +698,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
</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">- public function test_get_items_sticky_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_items_sticky() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id1 = self::$post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +719,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
</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">- public function test_get_items_sticky_with_post__in_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_items_sticky_with_include() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id1 = self::$post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,6 +733,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 0, $response->get_data() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // FIXME Since this request returns zero posts, the query is executed twice.
+ $this->assertCount( 2, $this->posts_clauses );
+ $this->posts_clauses = array_slice( $this->posts_clauses, 0, 1 );
+
+ $this->assertPostsWhere( " AND {posts}.ID IN (0) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( $id1, $id2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,10 +752,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $posts[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id1, $post['id'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertPostsWhere( " AND {posts}.ID IN ($id1) 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_get_items_not_sticky_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_items_sticky_no_sticky_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id1 = self::$post_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ update_option( 'sticky_posts', array() );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+ $request->set_param( 'sticky', true );
+
+ $response = $this->server->dispatch( $request );
+ $this->assertCount( 0, $response->get_data() );
+
+ // FIXME Since this request returns zero posts, the query is executed twice.
+ $this->assertCount( 2, $this->posts_clauses );
+ $this->posts_clauses = array_slice( $this->posts_clauses, 0, 1 );
+
+ $this->assertPostsWhere( " AND {posts}.ID IN (0) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
+ }
+
+ public function test_get_items_sticky_with_include_no_sticky_posts() {
+ $id1 = self::$post_id;
+
+ update_option( 'sticky_posts', array() );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+ $request->set_param( 'sticky', true );
+ $request->set_param( 'include', array( $id1 ) );
+
+ $response = $this->server->dispatch( $request );
+ $this->assertCount( 0, $response->get_data() );
+
+ // FIXME Since this request returns zero posts, the query is executed twice.
+ $this->assertCount( 2, $this->posts_clauses );
+ $this->posts_clauses = array_slice( $this->posts_clauses, 0, 1 );
+
+ $this->assertPostsWhere( " AND {posts}.ID IN (0) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
+ }
+
+ public function test_get_items_not_sticky() {
+ $id1 = self::$post_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sticky_posts', array( $id2 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,9 +808,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $posts[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id1, $post['id'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertPostsWhere( " AND {posts}.ID NOT IN ($id2) 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_get_items_sticky_with_post__not_in_query() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_items_not_sticky_with_exclude() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id1 = self::$post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,8 +829,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $posts[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id1, $post['id'] );
</span><ins style="background-color: #dfd; 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'))" );
</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">+ public function test_get_items_not_sticky_with_exclude_no_sticky_posts() {
+ $id1 = self::$post_id;
+ $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+ $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+
+ update_option( 'sticky_posts', array() );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+ $request->set_param( 'sticky', false );
+ $request->set_param( 'exclude', array( $id3 ) );
+
+ $response = $this->server->dispatch( $request );
+ $this->assertCount( 2, $response->get_data() );
+
+ $posts = $response->get_data();
+ $ids = wp_list_pluck( $posts, 'id' );
+ sort( $ids );
+ $this->assertEquals( array( $id1, $id2 ), $ids );
+
+ $this->assertPostsWhere( " AND {posts}.ID NOT IN ($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"> * @group test
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2917,6 +3049,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->attachment_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->remove_added_uploads();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'rest_pre_dispatch', array( $this, 'wpSetUpBeforeRequest' ), 10, 3 );
+ remove_filter( 'posts_clauses', array( $this, 'save_posts_clauses' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>