Merge pull request #2163 from WP-API/1260-delete-comment-response

rmccue · rmccue · commit d32b23e080fa · 2016-01-30T15:10:23.000Z
Return original resource with `DELETE /wp/v2/comments/&lt;id&gt;`
diff --git a/lib/endpoints/class-wp-rest-comments-controller.php b/lib/endpoints/class-wp-rest-comments-controller.php
@@ -487,14 +487,11 @@ public function delete_item( $request ) {
 		 */
 		$supports_trash = apply_filters( 'rest_comment_trashable', ( EMPTY_TRASH_DAYS > 0 ), $comment );
 
-		$get_request = new WP_REST_Request;
-		$get_request->set_param( 'id', $id );
-		$get_request->set_param( 'context', 'edit' );
-		$response = $this->prepare_item_for_response( $comment, $get_request );
+		$request->set_param( 'context', 'edit' );
+		$response = $this->prepare_item_for_response( $comment, $request );
 
 		if ( $force ) {
 			$result = wp_delete_comment( $comment->comment_ID, true );
-			$status = 'deleted';
 		} else {
 			// If we don't support trashing for this type, error out
 			if ( ! $supports_trash ) {
@@ -506,28 +503,20 @@ public function delete_item( $request ) {
 			}
 
 			$result = wp_trash_comment( $comment->comment_ID );
-			$status = 'trashed';
 		}
 
-		$data = $response->get_data();
-		$data = array(
-			'data'  => $data,
-			$status => true,
-		);
-		$response->set_data( $data );
-
 		if ( ! $result ) {
 			return new WP_Error( 'rest_cannot_delete', __( 'The comment cannot be deleted.' ), array( 'status' => 500 ) );
 		}
 
 		/**
 		 * Fires after a comment is deleted via the REST API.
 		 *
-		 * @param object          $comment The deleted comment data.
-		 * @param array           $data    Delete status data.
-		 * @param WP_REST_Request $request The request sent to the API.
+		 * @param object           $comment  The deleted comment data.
+		 * @param WP_REST_Response $response The response returned from the API.
+		 * @param WP_REST_Request  $request  The request sent to the API.
 		 */
-		do_action( 'rest_delete_comment', $comment, $data, $request );
+		do_action( 'rest_delete_comment', $comment, $response, $request );
 
 		return $response;
 	}
diff --git a/tests/test-rest-comments-controller.php b/tests/test-rest-comments-controller.php
@@ -1010,8 +1010,7 @@ public function test_delete_item() {
 		$response = $this->server->dispatch( $request );
 		$this->assertEquals( 200, $response->get_status() );
 		$data = $response->get_data();
-		$this->assertEquals( $this->post_id, $data['data']['post'] );
-		$this->assertTrue( $data['trashed'] );
+		$this->assertEquals( $this->post_id, $data['post'] );
 	}
 
 	public function test_delete_item_skip_trash() {
@@ -1028,8 +1027,7 @@ public function test_delete_item_skip_trash() {
 		$response = $this->server->dispatch( $request );
 		$this->assertEquals( 200, $response->get_status() );
 		$data = $response->get_data();
-		$this->assertEquals( $this->post_id, $data['data']['post'] );
-		$this->assertTrue( $data['deleted'] );
+		$this->assertEquals( $this->post_id, $data['post'] );
 	}
 
 	public function test_delete_item_already_trashed() {
@@ -1044,7 +1042,6 @@ public function test_delete_item_already_trashed() {
 		$response = $this->server->dispatch( $request );
 		$this->assertEquals( 200, $response->get_status() );
 		$data = $response->get_data();
-		$this->assertTrue( $data['trashed'] );
 		$response = $this->server->dispatch( $request );
 		$this->assertErrorResponse( 'rest_already_trashed', $response, 410 );
 	}
