Ticket #40344: 40344.2.diff

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

@@ -354 +354 @@
          */
         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();
 
@@ -424 +428 @@
          * @param mixed  $value Parameter value.
          */
         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;
         }
 
         /**

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

@@ -580 +580 @@
                 $request = WP_REST_Request::from_url( $using_home );
                 $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()
+                );
+        }
 }