Changeset 40113

Timestamp:

02/24/2017 08:56:00 PM (8 years ago)

Author:

SergeyBiryukov

Message:

REST API: Correctly parse body parameters for DELETE requests.

DELETE was inadvertently omitted from the list of non-POST HTTP methods that should be able to accept body parameters. Parameters passed to DELETE requests as JSON are already parsed correctly; this commit fixes application/x-www-form-urlencoded parameters as well.

Props mnelson4.
Merges [40105] to the 4.7 branch.
Fixes #39933.

Location:

branches/4.7

Files:

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

branches/4.7/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -365 +365 @@
         }
 
-        $accepts_body_data = array( 'POST', 'PUT', 'PATCH' );
+        $accepts_body_data = array( 'POST', 'PUT', 'PATCH', 'DELETE' );
         if ( in_array( $this->method, $accepts_body_data ) ) {
             $order[] = 'POST';

branches/4.7/tests/phpunit/tests/rest-api/rest-request.php

@@ -204 +204 @@
     }
 
+    public function non_post_http_methods_with_request_body_provider() {
+        return array(
+            array( 'PUT' ),
+            array( 'PATCH' ),
+            array( 'DELETE' ),
+        );
+    }
+
     /**
-     * PUT requests don't get $_POST automatically parsed, so ensure that
-     * WP_REST_Request does it for us.
+     * Tests that methods supporting request bodies have access to the
+     * request's body.  For POST this is straightforward via `$_POST`; for
+     * other methods `WP_REST_Request` needs to parse the body for us.
+     *
+     * @dataProvider non_post_http_methods_with_request_body_provider
      */
-    public function test_parameters_for_put() {
+    public function test_non_post_body_parameters( $request_method ) {
         $data = array(
             'foo' => 'bar',
@@ -220 +231 @@
             ),
         );
-
-        $this->request->set_method( 'PUT' );
+        $this->request->set_method( $request_method );
         $this->request->set_body_params( array() );
         $this->request->set_body( http_build_query( $data ) );
-
         foreach ( $data as $key => $expected_value ) {
             $this->assertEquals( $expected_value, $this->request->get_param( $key ) );