Ticket #38700: 38700.4.diff

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -624 +624 @@
                         return $prepared_args;
                 }
 
+                if ( ! empty( $prepared_args['comment_post_ID'] ) ) {
+                        $post = $this->get_post( $prepared_args['comment_post_ID'] );
+                        if ( empty( $post ) ) {
+                                return new WP_Error( 'rest_comment_invalid_post_id', __( 'Invalid comment post id.' ), array( 'status' => 404 ) );
+                        }
+                }
+
                 if ( empty( $prepared_args ) && isset( $request['status'] ) ) {
                         // Only the comment status is being changed.
                         $change = $this->handle_status_param( $request['status'], $comment );
@@ -644 +651 @@
                                 return new WP_Error( $error_code, __( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) );
                         }
 
-                        $updated = wp_update_comment( wp_slash( (array) $prepared_args ) );
-
-                        if ( 0 === $updated ) {
-                                return new WP_Error( 'rest_comment_failed_edit', __( 'Updating comment failed.' ), array( 'status' => 500 ) );
-                        }
+                        wp_update_comment( wp_slash( (array) $prepared_args ) );
 
                         if ( isset( $request['status'] ) ) {
                                 $this->handle_status_param( $request['status'], $comment );

tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -1618 +1618 @@
                 $this->assertEquals( '2014-11-07T10:14:25', $comment['date'] );
         }
 
+        public function test_update_item_no_change() {
+                wp_set_current_user( self::$admin_id );
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
+                $response = $this->server->dispatch( $request );
+                $this->assertEquals( 200, $response->get_status() );
+        }
+
         public function test_update_comment_status() {
                 wp_set_current_user( self::$admin_id );
 
@@ -1769 +1776 @@
                 $this->assertErrorResponse( 'rest_comment_invalid_id', $response, 404 );
         }
 
+        public function test_update_comment_invalid_post_id() {
+                wp_set_current_user( self::$admin_id );
+
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
+                $request->set_param( 'post', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
+                $request->set_param( 'content', 'avoid rest_comment_content_required error' );
+
+                $response = $this->server->dispatch( $request );
+                $this->assertErrorResponse( 'rest_comment_invalid_post_id', $response, 404 );
+        }
+
         public function test_update_comment_invalid_permission() {
                 wp_set_current_user( 0 );
 

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -1565 +1565 @@
                 $this->assertEquals( $params['excerpt'], $post->post_excerpt );
         }
 
+        public function test_update_item_no_change() {
+                wp_set_current_user( self::$editor_id );
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
+                $response = $this->server->dispatch( $request );
+                $this->check_update_post_response( $response );
+        }
+
         public function test_rest_update_post() {
                 wp_set_current_user( self::$editor_id );
 

tests/phpunit/tests/rest-api/rest-tags-controller.php

@@ -542 +542 @@
                 $this->assertEquals( 'new-slug', $data['slug'] );
         }
 
+        public function test_update_item_no_change() {
+                wp_set_current_user( self::$administrator );
+                $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+                $request = new WP_REST_Request( 'PUT', '/wp/v2/tags/' . $term->term_id );
+                $response = $this->server->dispatch( $request );
+                $this->assertEquals( 200, $response->get_status() );
+        }
+
         public function test_update_item_invalid_term() {
                 wp_set_current_user( self::$administrator );
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );

tests/phpunit/tests/rest-api/rest-users-controller.php

@@ -840 +840 @@
                 $this->assertEquals( $pw_before, $user->user_pass );
         }
 
+        public function test_update_item_no_change() {
+                $this->allow_user_to_manage_multisite();
+                wp_set_current_user( self::$user );
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', self::$editor ) );
+                $response = $this->server->dispatch( $request );
+                $this->assertEquals( 200, $response->get_status() );
+        }
+
         public function test_update_item_existing_email() {
                 $user1 = $this->factory->user->create( array( 'user_login' => 'test_json_user', 'user_email' => 'testjson@example.com' ) );
                 $user2 = $this->factory->user->create( array( 'user_login' => 'test_json_user2', 'user_email' => 'testjson2@example.com' ) );