diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index 0498e90f47..1dd54b27d6 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -1681,7 +1681,7 @@ function rest_format_combining_operation_error( $param, $error ) { $title = $error['schema']['title']; return new WP_Error( - 'rest_invalid_param', + 'rest_no_matching_schema', /* translators: 1: Parameter, 2: Schema title, 3: Reason. */ sprintf( __( '%1$s is not a valid %2$s. Reason: %3$s' ), $param, $title, $reason ), array( 'position' => $position ) @@ -1689,7 +1689,7 @@ function rest_format_combining_operation_error( $param, $error ) { } return new WP_Error( - 'rest_invalid_param', + 'rest_no_matching_schema', /* translators: 1: Parameter, 2: Reason. */ sprintf( __( '%1$s does not match the expected format. Reason: %2$s' ), $param, $reason ), array( 'position' => $position ) @@ -1758,11 +1758,11 @@ function rest_get_combining_operation_error( $value, $param, $errors ) { if ( count( $schema_titles ) === count( $errors ) ) { /* translators: 1: Parameter, 2: Schema titles. */ - return new WP_Error( 'rest_invalid_param', wp_sprintf( __( '%1$s is not a valid %2$l.' ), $param, $schema_titles ) ); + return new WP_Error( 'rest_no_matching_schema', wp_sprintf( __( '%1$s is not a valid %2$l.' ), $param, $schema_titles ) ); } /* translators: 1: Parameter. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s does not match any of the expected formats.' ), $param ) ); + return new WP_Error( 'rest_no_matching_schema', sprintf( __( '%1$s does not match any of the expected formats.' ), $param ) ); } /** @@ -1856,7 +1856,7 @@ function rest_find_one_matching_schema( $value, $args, $param, $stop_after_first // If each schema has a title, include those titles in the error message. if ( count( $schema_titles ) === count( $matching_schemas ) ) { return new WP_Error( - 'rest_invalid_param', + 'rest_one_of_multiple_matches', /* translators: 1: Parameter, 2: Schema titles. */ wp_sprintf( __( '%1$s matches %2$l, but should match only one.' ), $param, $schema_titles ), array( 'positions' => $schema_positions ) @@ -1864,7 +1864,7 @@ function rest_find_one_matching_schema( $value, $args, $param, $stop_after_first } return new WP_Error( - 'rest_invalid_param', + 'rest_one_of_multiple_matches', /* translators: 1: Parameter. */ sprintf( __( '%1$s matches more than one of the expected formats.' ), $param ), array( 'positions' => $schema_positions ) @@ -2010,7 +2010,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['minItems'] ) && count( $value ) < $args['minItems'] ) { return new WP_Error( - 'rest_invalid_param', + 'rest_too_few_items', sprintf( /* translators: 1: Parameter, 2: Number. */ _n( @@ -2026,7 +2026,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['maxItems'] ) && count( $value ) > $args['maxItems'] ) { return new WP_Error( - 'rest_invalid_param', + 'test_too_many_items', sprintf( /* translators: 1: Parameter, 2: Number. */ _n( @@ -2042,7 +2042,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( ! empty( $args['uniqueItems'] ) && ! rest_validate_array_contains_unique_items( $value ) ) { /* translators: 1: Parameter. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s has duplicate items.' ), $param ) ); + return new WP_Error( 'rest_duplicate_items', sprintf( __( '%1$s has duplicate items.' ), $param ) ); } } @@ -2095,7 +2095,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['additionalProperties'] ) ) { if ( false === $args['additionalProperties'] ) { /* translators: %s: Property of an object. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not a valid property of Object.' ), $property ) ); + return new WP_Error( 'rest_additional_properties_forbidden', sprintf( __( '%1$s is not a valid property of Object.' ), $property ) ); } if ( is_array( $args['additionalProperties'] ) ) { @@ -2109,7 +2109,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['minProperties'] ) && count( $value ) < $args['minProperties'] ) { return new WP_Error( - 'rest_invalid_param', + 'rest_too_few_properties', sprintf( /* translators: 1: Parameter, 2: Number. */ _n( @@ -2125,7 +2125,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['maxProperties'] ) && count( $value ) > $args['maxProperties'] ) { return new WP_Error( - 'rest_invalid_param', + 'rest_too_many_properties', sprintf( /* translators: 1: Parameter, 2: Number. */ _n( @@ -2156,7 +2156,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( ! empty( $args['enum'] ) ) { if ( ! in_array( $value, $args['enum'], true ) ) { /* translators: 1: Parameter, 2: List of valid values. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not one of %2$s.' ), $param, implode( ', ', $args['enum'] ) ) ); + return new WP_Error( 'rest_not_in_enum', sprintf( __( '%1$s is not one of %2$s.' ), $param, implode( ', ', $args['enum'] ) ) ); } } @@ -2172,7 +2172,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['multipleOf'] ) && fmod( $value, $args['multipleOf'] ) !== 0.0 ) { /* translators: 1: Parameter, 2: Multiplier. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be a multiple of %2$s.' ), $param, $args['multipleOf'] ) ); + return new WP_Error( 'rest_invalid_multiple', sprintf( __( '%1$s must be a multiple of %2$s.' ), $param, $args['multipleOf'] ) ); } } @@ -2206,7 +2206,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['minLength'] ) && mb_strlen( $value ) < $args['minLength'] ) { return new WP_Error( - 'rest_invalid_param', + 'rest_too_short', sprintf( /* translators: 1: Parameter, 2: Number of characters. */ _n( '%1$s must be at least %2$s character long.', '%1$s must be at least %2$s characters long.', $args['minLength'] ), @@ -2218,7 +2218,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['maxLength'] ) && mb_strlen( $value ) > $args['maxLength'] ) { return new WP_Error( - 'rest_invalid_param', + 'rest_too_long', sprintf( /* translators: 1: Parameter, 2: Number of characters. */ _n( '%1$s must be at most %2$s character long.', '%1$s must be at most %2$s characters long.', $args['maxLength'] ), @@ -2260,7 +2260,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { case 'ip': if ( ! rest_is_ip_address( $value ) ) { /* translators: %s: IP address. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not a valid IP address.' ), $param ) ); + return new WP_Error( 'rest_invalid_ip', sprintf( __( '%s is not a valid IP address.' ), $param ) ); } break; case 'uuid': @@ -2276,39 +2276,39 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['minimum'] ) && ! isset( $args['maximum'] ) ) { if ( ! empty( $args['exclusiveMinimum'] ) && $value <= $args['minimum'] ) { /* translators: 1: Parameter, 2: Minimum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d' ), $param, $args['minimum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be greater than %2$d' ), $param, $args['minimum'] ) ); } elseif ( empty( $args['exclusiveMinimum'] ) && $value < $args['minimum'] ) { /* translators: 1: Parameter, 2: Minimum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than or equal to %2$d' ), $param, $args['minimum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be greater than or equal to %2$d' ), $param, $args['minimum'] ) ); } } elseif ( isset( $args['maximum'] ) && ! isset( $args['minimum'] ) ) { if ( ! empty( $args['exclusiveMaximum'] ) && $value >= $args['maximum'] ) { /* translators: 1: Parameter, 2: Maximum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d' ), $param, $args['maximum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be less than %2$d' ), $param, $args['maximum'] ) ); } elseif ( empty( $args['exclusiveMaximum'] ) && $value > $args['maximum'] ) { /* translators: 1: Parameter, 2: Maximum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than or equal to %2$d' ), $param, $args['maximum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be less than or equal to %2$d' ), $param, $args['maximum'] ) ); } } elseif ( isset( $args['maximum'] ) && isset( $args['minimum'] ) ) { if ( ! empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) { if ( $value >= $args['maximum'] || $value <= $args['minimum'] ) { /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } elseif ( empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) { if ( $value >= $args['maximum'] || $value < $args['minimum'] ) { /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } elseif ( ! empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) { if ( $value > $args['maximum'] || $value <= $args['minimum'] ) { /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } elseif ( empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) { if ( $value > $args['maximum'] || $value < $args['minimum'] ) { /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_out_of_bounds', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } } @@ -2393,7 +2393,7 @@ function rest_sanitize_value_from_schema( $value, $args, $param = '' ) { if ( ! empty( $args['uniqueItems'] ) && ! rest_validate_array_contains_unique_items( $value ) ) { /* translators: 1: Parameter. */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s has duplicate items.' ), $param ) ); + return new WP_Error( 'rest_duplicate_items', sprintf( __( '%1$s has duplicate items.' ), $param ) ); } return $value; diff --git a/wp-includes/version.php b/wp-includes/version.php index bbecd23be8..c8453d76a4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-50006'; +$wp_version = '5.7-alpha-50007'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.