Ticket #40838: 40838.patch

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

@@ -421 +421 @@
         /**
          * Sets a parameter on the request.
          *
+         * If the given parameter key exists in any parameter type an update will take place,
+         * otherwise a new param will be created in the first parameter type (respecting
+         * get_parameter_order()).
+         *
          * @since 4.4.0
          * @access public
          *
@@ -429 +433 @@
          */
         public function set_param( $key, $value ) {
                 $order = $this->get_parameter_order();
-                $this->params[ $order[0] ][ $key ] = $value;
+                $found_key = false;
+
+                foreach ( $order as $type ) {
+                        if ( isset( $this->params[ $type ][ $key ] ) ) {
+                                $this->params[ $type ][ $key ] = $value;
+                                $found_key = true;
+                        }
+                }
+
+                if ( !$found_key ) {
+                        $this->params[ $order[0] ][ $key ] = $value;
+                }
         }
 
         /**

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

@@ -30 +30 @@
                 $this->assertNull( $this->request->get_header( 'missing' ) );
                 $this->assertNull( $this->request->get_header_as_array( 'missing' ) );
         }
-        
+
         public function test_remove_header() {
                 $this->request->add_header( 'Test-Header', 'value' );
                 $this->assertEquals( 'value', $this->request->get_header( 'Test-Header' ) );
-                
+
                 $this->request->remove_header( 'Test-Header' );
                 $this->assertNull( $this->request->get_header( 'Test-Header' ) );
         }
@@ -607 +607 @@
                         $request->get_json_params()
                 );
         }
+
+        public function test_set_param_updates_param_in_json_and_query() {
+                $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_body',
+                ) ) );
+                $request->set_query_params( array(
+                        'param' => 'value_query',
+                ) );
+                $request->set_param( 'param', 'new_value' );
+
+                $this->assertEquals( 'new_value', $request->get_param( 'param' ) );
+                $this->assertEquals( array( 'param' => 'new_value' ), $request->get_json_params() );
+                $this->assertEquals( array( 'param' => 'new_value' ), $request->get_query_params() );
+        }
+
+        public function test_set_param_updates_param_if_already_exists_in_query() {
+                $request = new WP_REST_Request();
+                $request->add_header( 'content-type', 'application/json' );
+                $request->set_method( 'POST' );
+                $request->set_body( wp_json_encode( array(
+                        'param_body' => 'value_body',
+                ) ) );
+                $request->set_query_params( array(
+                        'param_query' => 'value_query',
+                ) );
+                $request->set_param( 'param_query', 'new_value' );
+
+                $this->assertEquals( 'new_value', $request->get_param( 'param_query' ) );
+                $this->assertEquals( array( 'param_body' => 'value_body' ), $request->get_json_params() );
+                $this->assertEquals( array( 'param_query' => 'new_value' ), $request->get_query_params() );
+        }
 }