<!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>[41760] trunk: REST API: Support ordering response collection by listed slugs.</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/41760">41760</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/41760","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kadamwhite</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-05 00:36:43 +0000 (Thu, 05 Oct 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: Support ordering response collection by listed slugs.
Adds an "include_slug" orderby value for REST API collections to permit returning a collection filtered by slugs in the same order in which those slugs are specified.
Previously, the order of slugs provided with the ?slug query parameter had no effect on the order of the returned records.
Props wonderboymusic, ocean90, boonebgorges.
Fixes <a href="https://core.trac.wordpress.org/ticket/40826">#40826</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestcategoriescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
<li><a href="#trunktestsqunitfixtureswpapigeneratedjs">trunk/tests/qunit/fixtures/wp-api-generated.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswptermqueryphp"></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-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/src/wp-includes/class-wp-term-query.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 Introduced 'term_taxonomy_id' parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Introduced 'object_ids' parameter.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.9.0 Added 'slug__in' support for 'orderby'.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Array or query string of term query parameters. Default empty.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $orderby Field(s) to order terms by. Accepts term fields ('name',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'slug', 'term_group', 'term_id', 'id', 'description', 'parent'),
</span><span class="cx" style="display: block; padding: 0 10px"> * 'count' for term taxonomy count, 'include' to match the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'order' of the $include param, 'meta_value', 'meta_value_num',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'order' of the $include param, 'slug__in' to match the
+ * 'order' of the $slug param, 'meta_value', 'meta_value_num',
</ins><span class="cx" style="display: block; padding: 0 10px"> * the value of `$meta_key`, the array keys of `$meta_query`, or
</span><span class="cx" style="display: block; padding: 0 10px"> * 'none' to omit the ORDER BY clause. Defaults to 'name'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $order Whether to order terms in ascending or descending order.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,6 +843,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'include' == $_orderby && ! empty( $this->query_vars['include'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $include = implode( ',', wp_parse_id_list( $this->query_vars['include'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "FIELD( t.term_id, $include )";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'slug__in' == $_orderby && ! empty( $this->query_vars['slug'] ) && is_array( $this->query_vars['slug'] ) ) {
+ $slugs = implode( "', '", array_map( 'sanitize_title_for_query', $this->query_vars['slug__in'] ) );
+ $orderby = "FIELD( t.slug, '" . $slugs . "')";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'none' == $_orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $_orderby ) || 'id' == $_orderby || 'term_id' === $_orderby ) {
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></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/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">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,9 +874,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Map to proper WP_Query orderby param.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $query_args['orderby'] ) && isset( $request['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_mappings = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => 'ID',
- 'include' => 'post__in',
- 'slug' => 'post_name',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => 'ID',
+ 'include' => 'post__in',
+ 'slug' => 'post_name',
+ 'include_slugs' => '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 ( isset( $orderby_mappings[ $request['orderby'] ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2109,6 +2110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'relevance',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include_slugs',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title',
</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="trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></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/rest-api/endpoints/class-wp-rest-terms-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,6 +188,16 @@
</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">+ if ( isset( $prepared_args['orderby'] ) && isset( $request['orderby'] ) ) {
+ $orderby_mappings = array(
+ 'include_slugs' => 'slug__in',
+ );
+
+ if ( isset( $orderby_mappings[ $request['orderby'] ] ) ) {
+ $prepared_args['orderby'] = $orderby_mappings[ $request['orderby'] ];
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $registered['offset'] ) && ! empty( $request['offset'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_args['offset'] = $request['offset'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -932,6 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'include',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include_slugs',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'count',
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp"></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/rest-api/endpoints/class-wp-rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,6 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'display_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'registered_date' => 'registered',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'user_nicename',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include_slugs' => 'nicename__in',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => 'user_email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'user_url',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,6 +1339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'registered_date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include_slugs',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestcategoriescontrollerphp"></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-categories-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-categories-controller.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,6 +287,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Cantaloupe', $data[2]['name'] );
</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">+ public function test_get_items_orderby_slugs() {
+ $this->factory->category->create( array( 'name' => 'Burrito' ) );
+ $this->factory->category->create( array( 'name' => 'Taco' ) );
+ $this->factory->category->create( array( 'name' => 'Chalupa' ) );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+ $request->set_param( 'orderby', 'include_slugs' );
+ $request->set_param( 'slug', array( 'taco', 'burrito', 'chalupa' ) );
+ $response = $this->server->dispatch( $request );
+ $data = $response->get_data();
+ $this->assertEquals( 200, $response->get_status() );
+ $this->assertEquals( 'taco', $data[0]['slug'] );
+ $this->assertEquals( 'burrito', $data[1]['slug'] );
+ $this->assertEquals( 'chalupa', $data[2]['slug'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function post_with_categories() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $category1 = $this->factory->category->create( array(
</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 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,6 +598,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertPostsOrderedBy( '{posts}.post_name DESC' );
</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">+ public function test_get_items_with_orderby_slugs() {
+ $slugs = array( 'burrito', 'taco', 'chalupa' );
+ foreach ( $slugs as $slug ) {
+ $this->factory->post->create( array( 'post_title' => $slug, 'post_name' => $slug, 'post_status' => 'publish' ) );
+ }
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+ $request->set_param( 'orderby', 'include_slugs' );
+ $request->set_param( 'slug', array( 'taco', 'chalupa', 'burrito' ) );
+
+ $response = $this->server->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertEquals( 'taco', $data[0]['slug'] );
+ $this->assertEquals( 'chalupa', $data[1]['slug'] );
+ $this->assertEquals( 'burrito', $data[2]['slug'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_with_orderby_relevance() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->post->create( array( 'post_title' => 'Title is more relevant', 'post_content' => 'Content is', 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->post->create( array( 'post_title' => 'Title is', 'post_content' => 'Content is less relevant', 'post_status' => 'publish' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></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-tags-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-tags-controller.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +250,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Cantaloupe', $data[2]['name'] );
</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">+ public function test_get_items_orderby_slugs() {
+ $this->factory->tag->create( array( 'name' => 'Burrito' ) );
+ $this->factory->tag->create( array( 'name' => 'Taco' ) );
+ $this->factory->tag->create( array( 'name' => 'Chalupa' ) );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+ $request->set_param( 'orderby', 'include_slugs' );
+ $request->set_param( 'slug', array( 'taco', 'burrito', 'chalupa' ) );
+ $response = $this->server->dispatch( $request );
+ $data = $response->get_data();
+ $this->assertEquals( 200, $response->get_status() );
+ $this->assertEquals( 'taco', $data[0]['slug'] );
+ $this->assertEquals( 'burrito', $data[1]['slug'] );
+ $this->assertEquals( 'chalupa', $data[2]['slug'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_post_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 = $this->factory->tag->create( array( 'name' => 'DC' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestuserscontrollerphp"></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-users-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-users-controller.php 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,6 +409,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $low_id, $data[0]['id'] );
</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">+ public function test_get_items_orderby_slugs() {
+ wp_set_current_user( self::$user );
+
+ $this->factory->user->create( array( 'user_nicename' => 'burrito' ) );
+ $this->factory->user->create( array( 'user_nicename' => 'taco' ) );
+ $this->factory->user->create( array( 'user_nicename' => 'chalupa' ) );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+ $request->set_param( 'orderby', 'include_slugs' );
+ $request->set_param( 'slug', array( 'taco', 'burrito', 'chalupa' ) );
+ $response = $this->server->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertEquals( 'taco', $data[0]['slug'] );
+ $this->assertEquals( 'burrito', $data[1]['slug'] );
+ $this->assertEquals( 'chalupa', $data[2]['slug'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_orderby_email() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsqunitfixtureswpapigeneratedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/wp-api-generated.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api-generated.js 2017-10-05 00:21:27 UTC (rev 41759)
+++ trunk/tests/qunit/fixtures/wp-api-generated.js 2017-10-05 00:36:43 UTC (rev 41760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,6 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "parent",
</span><span class="cx" style="display: block; padding: 0 10px"> "relevance",
</span><span class="cx" style="display: block; padding: 0 10px"> "slug",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "include_slugs",
</ins><span class="cx" style="display: block; padding: 0 10px"> "title"
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "description": "Sort collection by object attribute.",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,6 +906,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "parent",
</span><span class="cx" style="display: block; padding: 0 10px"> "relevance",
</span><span class="cx" style="display: block; padding: 0 10px"> "slug",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "include_slugs",
</ins><span class="cx" style="display: block; padding: 0 10px"> "title",
</span><span class="cx" style="display: block; padding: 0 10px"> "menu_order"
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,6 +1445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "parent",
</span><span class="cx" style="display: block; padding: 0 10px"> "relevance",
</span><span class="cx" style="display: block; padding: 0 10px"> "slug",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "include_slugs",
</ins><span class="cx" style="display: block; padding: 0 10px"> "title"
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "description": "Sort collection by object attribute.",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2023,6 +2026,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "include",
</span><span class="cx" style="display: block; padding: 0 10px"> "name",
</span><span class="cx" style="display: block; padding: 0 10px"> "slug",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "include_slugs",
</ins><span class="cx" style="display: block; padding: 0 10px"> "term_group",
</span><span class="cx" style="display: block; padding: 0 10px"> "description",
</span><span class="cx" style="display: block; padding: 0 10px"> "count"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2266,6 +2270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "include",
</span><span class="cx" style="display: block; padding: 0 10px"> "name",
</span><span class="cx" style="display: block; padding: 0 10px"> "slug",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "include_slugs",
</ins><span class="cx" style="display: block; padding: 0 10px"> "term_group",
</span><span class="cx" style="display: block; padding: 0 10px"> "description",
</span><span class="cx" style="display: block; padding: 0 10px"> "count"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2495,6 +2500,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "name",
</span><span class="cx" style="display: block; padding: 0 10px"> "registered_date",
</span><span class="cx" style="display: block; padding: 0 10px"> "slug",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "include_slugs",
</ins><span class="cx" style="display: block; padding: 0 10px"> "email",
</span><span class="cx" style="display: block; padding: 0 10px"> "url"
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span></span></pre>
</div>
</div>
</body>
</html>