Changeset 61335

Timestamp:

12/01/2025 03:01:27 PM (9 months ago)

Author:

SergeyBiryukov

Message:

Options, Meta APIs: Revert additional request validity handling that was added to the /wp/v2/settings REST API route. This change needs more work to account for URL query parameters used in place of body data.

This reverts [60357] and [60301].

Reviewed by johnbillion, SergeyBiryukov.
Merges [61324] to the 6.9 branch.

See #41604.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-settings-controller.php (modified) (2 diffs)

branches/6.9/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php

@@ -146 +146 @@
                 $options = $this->get_registered_options();
 
-                $params = array_diff_key( $request->get_params(), $request->get_query_params() );
-
-                if ( empty( $params ) || ! empty( array_diff_key( $params, $options ) ) ) {
-                        $message = empty( $params )
-                                ? __( 'Request body cannot be empty.' )
-                                : __( 'Invalid parameter(s) provided.' );
-
-                        return new WP_Error(
-                                'rest_invalid_param',
-                                $message,
-                                array( 'status' => 400 )
-                        );
-                }
+                $params = $request->get_params();
 
                 foreach ( $options as $name => $args ) {

branches/6.9/tests/phpunit/tests/rest-api/rest-settings-controller.php

@@ -386 +386 @@
 
         /**
-         * Settings can't be created
+         * @doesNotPerformAssertions
          */
         public function test_create_item() {
-                wp_set_current_user( self::$administrator );
-
-                $request = new WP_REST_Request( 'POST', '/wp/v2/settings' );
-                $request->set_param( 'new_setting', 'New value' );
-                $response = rest_get_server()->dispatch( $request );
-
-                $this->assertSame( 400, $response->get_status() );
-        }
-
-        /**
-         * @ticket 41604
-         */
+                // Controller does not implement create_item().
+        }
+
         public function test_update_item() {
                 wp_set_current_user( self::$administrator );
-
                 $request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
                 $request->set_param( 'title', 'The new title!' );
@@ -412 +402 @@
                 $this->assertSame( 'The new title!', $data['title'] );
                 $this->assertSame( get_option( 'blogname' ), $data['title'] );
-        }
-
-        /**
-         * @ticket 41604
-         */
-        public function test_update_item_with_global_parameters_present() {
-                wp_set_current_user( self::$administrator );
-
-                $request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
-                $request->set_param( 'title', 'The new title!' );
-                $request->set_url_params( array( '_locale' => 'user' ) );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-
-                $this->assertSame( 200, $response->get_status() );
-                $this->assertSame( 'The new title!', $data['title'] );
-                $this->assertSame( get_option( 'blogname' ), $data['title'] );
-        }
-
-        /**
-         * @ticket 41604
-         */
-        public function test_update_item_with_empty_body() {
-                wp_set_current_user( self::$administrator );
-
-                $request  = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-
-                $this->assertSame( 400, $response->get_status() );
-        }
-
-        /**
-         * @ticket 41604
-         */
-        public function test_update_nonexistent_item() {
-                wp_set_current_user( self::$administrator );
-
-                $request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
-                $request->set_param( 'i_do_no_exist', 'New value' );
-                $response = rest_get_server()->dispatch( $request );
-
-                $this->assertSame( 400, $response->get_status() );
-        }
-
-        /**
-         * @ticket 41604
-         */
-        public function test_update_partially_valid_items() {
-                wp_set_current_user( self::$administrator );
-
-                $request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
-                $request->set_param( 'title', 'The new title!' );
-                $request->set_param( 'i_do_no_exist', 'New value' );
-                $response = rest_get_server()->dispatch( $request );
-
-                $this->assertSame( 400, $response->get_status() );
         }