Changeset 47758 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php

Timestamp:

05/04/2020 02:44:44 AM (6 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Support more JSON Schemas when filtering a response by context.

The array type, multi-types, and the additional properties keyword are now supported. Additionally, the filter recurses to an infinite depth.

Fixes #48819.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php (modified) (2 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php

@@ -289 +289 @@
      * @since 4.7.0
      *
-     * @param array  $data    Response data to fiter.
+     * @param array  $data    Response data to filter.
      * @param string $context Context defined in the schema.
      * @return array Filtered response.
@@ -297 +297 @@
         $schema = $this->get_item_schema();
 
-        foreach ( $data as $key => $value ) {
-            if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) {
-                continue;
-            }
-
-            if ( ! in_array( $context, $schema['properties'][ $key ]['context'], true ) ) {
-                unset( $data[ $key ] );
-                continue;
-            }
-
-            if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) {
-                foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) {
-                    if ( empty( $details['context'] ) ) {
-                        continue;
-                    }
-
-                    if ( ! in_array( $context, $details['context'], true ) ) {
-                        if ( isset( $data[ $key ][ $attribute ] ) ) {
-                            unset( $data[ $key ][ $attribute ] );
-                        }
-                    }
-                }
-            }
-        }
-
-        return $data;
+        return rest_filter_response_by_context( $data, $schema, $context );
     }