Skip to content
This repository was archived by the owner on Sep 24, 2018. It is now read-only.

Link taxonomies to their associated collections #1817

Merged
danielbachhuber merged 2 commits into from
Dec 9, 2015
Merged

Link taxonomies to their associated collections #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
964247d
Link taxonomies to their associated collections
danielbachhuber Dec 9, 2015
00f84b2
Fix formatting of closing parens
danielbachhuber Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/endpoints/class-wp-rest-taxonomies-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public function get_items( $request ) {
if ( is_wp_error( $tax ) ) {
continue;
}
$tax = $this->prepare_response_for_collection( $tax );
$data[] = $tax;
}
return $data;
Expand Down Expand Up @@ -110,12 +111,22 @@ public function prepare_item_for_response( $taxonomy, $request ) {
$data = $this->filter_response_by_context( $data, $context );
$data = $this->add_additional_fields_to_object( $data, $request );

// Wrap the data in a response object.
$data = rest_ensure_response( $data );

$base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
$data->add_links( array(
'collection' => array(
'href' => rest_url( sprintf( 'wp/v2/%s', $base ) ),
),
) );

/**
* Filter a taxonomy returned from the API.
*
* Allows modification of the taxonomy data right before it is returned.
*
* @param array $data Key value array of taxonomy data.
* @param array $data An array of taxonomy date, prepared for response.
* @param object $item The taxonomy object.
* @param WP_REST_Request $request Request used to generate the response.
*/
Expand Down
9 changes: 5 additions & 4 deletions tests/test-rest-taxonomies-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public function test_delete_item() {
public function test_prepare_item() {
$tax = get_taxonomy( 'category' );
$endpoint = new WP_REST_Taxonomies_Controller;
$data = $endpoint->prepare_item_for_response( $tax, new WP_REST_Request );
$this->check_taxonomy_object( $tax, $data );
$response = $endpoint->prepare_item_for_response( $tax, new WP_REST_Request );
$this->check_taxonomy_object( $tax, $response->get_data(), $response->get_links() );
}

public function test_get_item_schema() {
Expand Down Expand Up @@ -103,12 +103,13 @@ private function get_public_taxonomies( $taxonomies ) {
return array_values( array_filter( $taxonomies, array( $this, 'is_public' ) ) );
}

protected function check_taxonomy_object( $tax_obj, $data ) {
protected function check_taxonomy_object( $tax_obj, $data, $links ) {
$this->assertEquals( $tax_obj->label, $data['name'] );
$this->assertEquals( $tax_obj->name, $data['slug'] );
$this->assertEquals( $tax_obj->description, $data['description'] );
$this->assertEquals( $tax_obj->show_tagcloud, $data['show_cloud'] );
$this->assertEquals( $tax_obj->hierarchical, $data['hierarchical'] );
$this->assertArrayHasKey( 'collection', $links );
}

protected function check_taxonomy_object_response( $response ) {
Expand All @@ -117,7 +118,7 @@ protected function check_taxonomy_object_response( $response ) {
$this->assertEquals( 200, $response->get_status() );
$data = $response->get_data();
$category = get_taxonomy( 'category' );
$this->check_taxonomy_object( $category, $data );
$this->check_taxonomy_object( $category, $data, $response->get_links() );
}

protected function check_taxonomies_for_type_response( $type, $response ) {
Expand Down