enmi-conf.org: comparison wp/wp-includes/rest-api/class-wp-rest-request.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 		return $data;
 	}
 	/**
+	 * Checks if the request has specified a JSON content-type.
+	 *
+	 * @since 5.6.0
+	 *
+	 * @return bool True if the content-type header is JSON.
+	 */
+	public function is_json_content_type() {
+		$content_type = $this->get_content_type();
+		return isset( $content_type['value'] ) && wp_is_json_media_type( $content_type['value'] );
+	}
+	/**
 	 * Retrieves the parameter priority order.
 	 *
-	 * Used when checking parameters in get_param().
+	 * Used when checking parameters in WP_REST_Request::get_param().
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return string[] Array of types to check, in order of priority.
 	 */
 	protected function get_parameter_order() {
 		$order = array();
-		$content_type = $this->get_content_type();
+		if ( $this->is_json_content_type() ) {
-		if ( isset( $content_type['value'] ) && 'application/json' === $content_type['value'] ) {
 			$order[] = 'JSON';
 		}
 		$this->parse_json_params();
 		$order[] = 'GET';
 		$order[] = 'URL';
 		$order[] = 'defaults';
 		/**
-		 * Filters the parameter order.
+		 * Filters the parameter priority order for a REST API request.
 		 *
-		 * The order affects which parameters are checked when using get_param() and family.
+		 * The order affects which parameters are checked when using WP_REST_Request::get_param()
-		 * This acts similarly to PHP's `request_order` setting.
+		 * and family. This acts similarly to PHP's `request_order` setting.
 		 *
 		 * @since 4.4.0
 		 *
 		 * @param string[]        $order Array of types to check, in order of priority.
 		 * @param WP_REST_Request $this  The request object.
 		}
 		$this->parsed_json = true;
 		// Check that we actually got JSON.
-		$content_type = $this->get_content_type();
+		if ( ! $this->is_json_content_type() ) {
-		if ( empty( $content_type ) || 'application/json' !== $content_type['value'] ) {
 			return true;
 		}
 		$body = $this->get_body();
 		if ( empty( $body ) ) {
 			return true;
 		}
 		$order = $this->get_parameter_order();
-		$invalid_params = array();
+		$invalid_params  = array();
+		$invalid_details = array();
 		foreach ( $order as $type ) {
 			if ( empty( $this->params[ $type ] ) ) {
 				continue;
 			}
 				// If there's still no sanitize_callback, nothing to do here.
 				if ( empty( $param_args['sanitize_callback'] ) ) {
 					continue;
 				}
+				/** @var mixed|WP_Error $sanitized_value */
 				$sanitized_value = call_user_func( $param_args['sanitize_callback'], $value, $this, $key );
 				if ( is_wp_error( $sanitized_value ) ) {
-					$invalid_params[ $key ] = $sanitized_value->get_error_message();
+					$invalid_params[ $key ]  = implode( ' ', $sanitized_value->get_error_messages() );
+					$invalid_details[ $key ] = rest_convert_error_to_response( $sanitized_value )->get_data();
 				} else {
 					$this->params[ $type ][ $key ] = $sanitized_value;
 				}
 			}
 		}
 			return new WP_Error(
 				'rest_invalid_param',
 				/* translators: %s: List of invalid parameters. */
 				sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
 				array(
-					'status' => 400,
+					'status'  => 400,
-					'params' => $invalid_params,
+					'params'  => $invalid_params,
+					'details' => $invalid_details,
 				)
 			);
 		}
 		return true;
 	/**
 	 * Checks whether this request is valid according to its attributes.
 	 *
 	 * @since 4.4.0
 	 *
-	 * @return bool|WP_Error True if there are no parameters to validate or if all pass validation,
+	 * @return true|WP_Error True if there are no parameters to validate or if all pass validation,
 	 *                       WP_Error if required parameters are missing.
 	 */
 	public function has_valid_params() {
 		// If JSON data was passed, check for errors.
 		$json_error = $this->parse_json_params();
 		}
 		$attributes = $this->get_attributes();
 		$required   = array();
-		// No arguments set, skip validation.
+		$args = empty( $attributes['args'] ) ? array() : $attributes['args'];
-		if ( empty( $attributes['args'] ) ) {
-			return true;
+		foreach ( $args as $key => $arg ) {
-		}
-		foreach ( $attributes['args'] as $key => $arg ) {
 			$param = $this->get_param( $key );
 			if ( isset( $arg['required'] ) && true === $arg['required'] && null === $param ) {
 				$required[] = $key;
 			}
 		}
 		/*
 		 * Check the validation callbacks for each registered arg.
 		 *
 		 * This is done after required checking as required checking is cheaper.
 		 */
-		$invalid_params = array();
+		$invalid_params  = array();
+		$invalid_details = array();
-		foreach ( $attributes['args'] as $key => $arg ) {
+		foreach ( $args as $key => $arg ) {
 			$param = $this->get_param( $key );
 			if ( null !== $param && ! empty( $arg['validate_callback'] ) ) {
+				/** @var bool|\WP_Error $valid_check */
 				$valid_check = call_user_func( $arg['validate_callback'], $param, $this, $key );
 				if ( false === $valid_check ) {
 					$invalid_params[ $key ] = __( 'Invalid parameter.' );
 				}
 				if ( is_wp_error( $valid_check ) ) {
-					$invalid_params[ $key ] = $valid_check->get_error_message();
+					$invalid_params[ $key ]  = implode( ' ', $valid_check->get_error_messages() );
+					$invalid_details[ $key ] = rest_convert_error_to_response( $valid_check )->get_data();
 				}
 			}
 		}
 		if ( $invalid_params ) {
 			return new WP_Error(
 				'rest_invalid_param',
 				/* translators: %s: List of invalid parameters. */
 				sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
 				array(
-					'status' => 400,
+					'status'  => 400,
-					'params' => $invalid_params,
+					'params'  => $invalid_params,
+					'details' => $invalid_details,
 				)
 			);
 		}
+		if ( isset( $attributes['validate_callback'] ) ) {
+			$valid_check = call_user_func( $attributes['validate_callback'], $this );
+			if ( is_wp_error( $valid_check ) ) {
+				return $valid_check;
+			}
+			if ( false === $valid_check ) {
+				// A WP_Error instance is preferred, but false is supported for parity with the per-arg validate_callback.
+				return new WP_Error( 'rest_invalid_params', __( 'Invalid parameters.' ), array( 'status' => 400 ) );
+			}
+		}
 		return true;
 	}
 	/**
 	 * Checks if a parameter is set.
 	 *
 			$request = new WP_REST_Request( 'GET', $route );
 			$request->set_query_params( $query_params );
 		}
 		/**
-		 * Filters the request generated from a URL.
+		 * Filters the REST API request generated from a URL.
 		 *
 		 * @since 4.5.0
 		 *
 		 * @param WP_REST_Request|false $request Generated request object, or false if URL
 		 *                                       could not be parsed.

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4