Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 13:44:21 +01:00
Code Issues Projects Releases Wiki Activity

REST API: Support the (min|max)Items JSON Schema keywords.

Browse Source 
A future commit will add support for the uniqueItems keyword.

Props sorenbronsted.
See #48821.

Built from https://develop.svn.wordpress.org/trunk@47923


git-svn-id: http://core.svn.wordpress.org/trunk@47697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
TimothyBlynJacobs 2020-06-07 22:42:13 +00:00
parent 18a9359c06
commit 5efaf888a5
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/rest-api.php
View File

@ -1250,6 +1250,7 @@ function rest_get_avatar_sizes() {
* @since 5.5.0 Add the "uuid" and "hex-color" formats. * @since 5.5.0 Add the "uuid" and "hex-color" formats.
* Support the "minLength", "maxLength" and "pattern" keywords for strings. * Support the "minLength", "maxLength" and "pattern" keywords for strings.
* Validate required properties. * Validate required properties.
* Support the "minItems" and "maxItems" keywords for arrays.
* *
* @param mixed $value The value to validate. * @param mixed $value The value to validate.
* @param array $args Schema array to use for validation. * @param array $args Schema array to use for validation.
@ -1287,6 +1288,16 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) {
return $is_valid; return $is_valid;
} }
} }
if ( isset( $args['minItems'] ) && count( $value ) < $args['minItems'] ) {
/* translators: 1: Parameter, 2: number. */
return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must contain at least %2$s items.' ), $param, number_format_i18n( $args['minItems'] ) ) );
}
if ( isset( $args['maxItems'] ) && count( $value ) > $args['maxItems'] ) {
/* translators: 1: Parameter, 2: number. */
return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must contain at most %2$s items.' ), $param, number_format_i18n( $args['maxItems'] ) ) );
}
} }
if ( 'object' === $args['type'] ) { if ( 'object' === $args['type'] ) {

2
wp-includes/rest-api/endpoints/class-wp-rest-controller.php
View File

@ -643,6 +643,8 @@ abstract class WP_REST_Controller {
'minLength', 'minLength',
'maxLength', 'maxLength',
'pattern', 'pattern',
'minItems',
'maxItems',
); );
foreach ( $schema_properties as $field_id => $params ) { foreach ( $schema_properties as $field_id => $params ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47922'; $wp_version = '5.5-alpha-47923';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.