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

Timestamp:

07/21/2020 09:20:22 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Optimize rest_filter_response_by_context performance.

In [47758] a new function rest_filter_response_by_context was introduced to expand the JSON schema features supported by the context filtering mechanism.

This commit improves the performance of that function by eliminating repetitive comparisons and loops. Additionally, it improves multi-type support for object + array types.

Fixes #50700.
Props dlh.

File:

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

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

@@ -2053 +2053 @@
     }
 
+    $is_array_type  = 'array' === $type || ( is_array( $type ) && in_array( 'array', $type, true ) );
+    $is_object_type = 'object' === $type || ( is_array( $type ) && in_array( 'object', $type, true ) );
+
+    if ( $is_array_type && $is_object_type ) {
+        if ( rest_is_array( $data ) ) {
+            $is_object_type = false;
+        } else {
+            $is_array_type = false;
+        }
+    }
+
+    $has_additional_properties = $is_object_type && isset( $schema['additionalProperties'] ) && is_array( $schema['additionalProperties'] );
+
     foreach ( $data as $key => $value ) {
         $check = array();
 
-        if ( 'array' === $type || ( is_array( $type ) && in_array( 'array', $type, true ) ) ) {
+        if ( $is_array_type ) {
             $check = isset( $schema['items'] ) ? $schema['items'] : array();
-        } elseif ( 'object' === $type || ( is_array( $type ) && in_array( 'object', $type, true ) ) ) {
+        } elseif ( $is_object_type ) {
             if ( isset( $schema['properties'][ $key ] ) ) {
                 $check = $schema['properties'][ $key ];
-            } elseif ( isset( $schema['additionalProperties'] ) && is_array( $schema['additionalProperties'] ) ) {
+            } elseif ( $has_additional_properties ) {
                 $check = $schema['additionalProperties'];
             }
@@ -2071 +2084 @@
 
         if ( ! in_array( $context, $check['context'], true ) ) {
+            if ( $is_array_type ) {
+                // All array items share schema, so there's no need to check each one.
+                $data = array();
+                break;
+            }
+
             if ( is_object( $data ) ) {
                 unset( $data->$key );