Changeset 45807 for trunk/src/wp-includes/rest-api.php

Timestamp:

08/15/2019 05:16:21 PM (7 years ago)

Author:

kadamwhite

Message:

REST API: Support 'object' and 'array' types in register_meta() schemas.

Extends meta registration to support complex schema values, mirroring the functionality in the settings controller.
Error when trying to modify a meta key containing schema-nonconformant data.

Props @TimothyBlynJacobs, @birgire, @mnelson4, @flixos90.
Fixes #43392.

File:

• trunk/src/wp-includes/rest-api.php (modified) (4 diffs)

trunk/src/wp-includes/rest-api.php

@@ -1160 +1160 @@
                         $value = (array) $value;
                 }
+
+                if ( $value instanceof JsonSerializable ) {
+                        $value = $value->jsonSerialize();
+                }
+
                 if ( ! is_array( $value ) ) {
                         /* translators: 1: parameter, 2: type name */
@@ -1171 +1176 @@
                                         return $is_valid;
                                 }
-                        } elseif ( isset( $args['additionalProperties'] ) && false === $args['additionalProperties'] ) {
-                                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not a valid property of Object.' ), $property ) );
+                        } elseif ( isset( $args['additionalProperties'] ) ) {
+                                if ( false === $args['additionalProperties'] ) {
+                                        return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not a valid property of Object.' ), $property ) );
+                                }
+
+                                if ( is_array( $args['additionalProperties'] ) ) {
+                                        $is_valid = rest_validate_value_from_schema( $v, $args['additionalProperties'], $param . '[' . $property . ']' );
+                                        if ( is_wp_error( $is_valid ) ) {
+                                                return $is_valid;
+                                        }
+                                }
                         }
                 }
@@ -1299 +1313 @@
                         $value = (array) $value;
                 }
+
+                if ( $value instanceof JsonSerializable ) {
+                        $value = $value->jsonSerialize();
+                }
+
                 if ( ! is_array( $value ) ) {
                         return array();
@@ -1306 +1325 @@
                         if ( isset( $args['properties'][ $property ] ) ) {
                                 $value[ $property ] = rest_sanitize_value_from_schema( $v, $args['properties'][ $property ] );
-                        } elseif ( isset( $args['additionalProperties'] ) && false === $args['additionalProperties'] ) {
-                                unset( $value[ $property ] );
+                        } elseif ( isset( $args['additionalProperties'] ) ) {
+                                if ( false === $args['additionalProperties'] ) {
+                                        unset( $value[ $property ] );
+                                } elseif ( is_array( $args['additionalProperties'] ) ) {
+                                        $value[ $property ] = rest_sanitize_value_from_schema( $v, $args['additionalProperties'] );
+                                }
                         }
                 }