Ticket #53056: 53056.diff

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -497 +497 @@
                         $json_error_message = $this->get_json_last_error();
 
                         if ( $json_error_message ) {
+                                $this->set_status( 500 );
                                 $json_error_obj = new WP_Error(
                                         'rest_encode_error',
                                         $json_error_message,

tests/phpunit/includes/spy-rest-server.php

@@ -6 +6 @@
         public $sent_body           = '';
         public $last_request        = null;
         public $override_by_default = false;
+        public $status              = null;
 
         /**
          * Gets the raw $endpoints data from the server.
@@ -37 +38 @@
                 $this->sent_headers[ $header ] = $value;
         }
 
+        /**
+         * Stores last set status.
+         * @param int $code HTTP status.
+         */
+        public function set_status( $status ) {
+                $this->status = $status;
+        }
+
         /**
          * Removes a header from the list of sent headers.
          *

tests/phpunit/tests/rest-api/rest-server.php

@@ -2022 +2022 @@
                 $this->assertArrayHasKey( 'https://api.w.org/active-theme', $index->get_links() );
         }
 
+        /**
+         * @ticket 53056
+         */
+        public function test_json_encode_error_results_in_500_status_code() {
+                register_rest_route(
+                        'test-ns/v1',
+                        '/test',
+                        array(
+                                array(
+                                        'methods'             => \WP_REST_Server::READABLE,
+                                        'callback'            => function() {
+                                                return new \WP_REST_Response( INF );
+                                        },
+                                        'permission_callback' => '__return_true',
+                                        'args'                => array(),
+                                ),
+                        )
+                );
+                rest_get_server()->serve_request( '/test-ns/v1/test' );
+                $this->assertSame( 500, rest_get_server()->status );
+        }
+
         public function _validate_as_integer_123( $value, $request, $key ) {
                 if ( ! is_int( $value ) ) {
                         return new WP_Error( 'some-error', 'This is not valid!' );