Changeset 40815

Timestamp:

05/22/2017 04:15:25 PM (7 years ago)

Author:

jnylen0

Message:

REST API: Fix changing parameters with set_param() for some requests.

Prior to this commit, WP_Rest_Request::get_param() traversed through the parameter order but WP_Rest_Request::set_param() did not. For JSON requests (and likely other situations as well), this meant that changing a parameter with set_param() would have no effect on get_param().

Props TimothyBlynJacobs.
Fixes #40344.

Location:

trunk

Files:

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

trunk/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -355 +355 @@
     protected function get_parameter_order() {
         $order = array();
-        $order[] = 'JSON';
+
+        $content_type = $this->get_content_type();
+        if ( $content_type['value'] === 'application/json' ) {
+            $order[] = 'JSON';
+        }
 
         $this->parse_json_params();
@@ -425 +429 @@
      */
     public function set_param( $key, $value ) {
-        switch ( $this->method ) {
-            case 'POST':
-                $this->params['POST'][ $key ] = $value;
-                break;
-
-            default:
-                $this->params['GET'][ $key ] = $value;
-                break;
-        }
+        $order = $this->get_parameter_order();
+        $this->params[ $order[0] ][ $key ] = $value;
     }
 

trunk/tests/phpunit/tests/rest-api/rest-request.php

@@ -581 +581 @@
         $this->assertFalse( $request );
     }
+
+    public function test_set_param() {
+        $request = new WP_REST_Request();
+        $request->set_param( 'param', 'value' );
+        $this->assertEquals( 'value', $request->get_param( 'param' ) );
+    }
+
+    public function test_set_param_follows_parameter_order() {
+        $request = new WP_REST_Request();
+        $request->add_header( 'content-type', 'application/json' );
+        $request->set_method( 'POST' );
+        $request->set_body( wp_json_encode( array(
+            'param' => 'value'
+        ) ) );
+        $this->assertEquals( 'value', $request->get_param( 'param' ) );
+        $this->assertEquals(
+            array( 'param' => 'value' ),
+            $request->get_json_params()
+        );
+
+        $request->set_param( 'param', 'new_value' );
+        $this->assertEquals( 'new_value', $request->get_param( 'param' ) );
+        $this->assertEquals(
+            array( 'param' => 'new_value' ),
+            $request->get_json_params()
+        );
+    }
 }