Changeset 49308

Timestamp:

10/25/2020 08:28:50 PM (5 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Prevent PHP warning when metadata schema is missing properties.

This switches to the new rest_default_additional_properties_to_false() function which doesn't have this issue and deprecates the WP_REST_Meta_Fields::default_additional_properties_to_false() method.

Props austin880625.
Fixes #51389.

File:

• trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php (modified) (3 diffs)

trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php

@@ -467 +467 @@
             }
 
-            $rest_args['schema'] = $this->default_additional_properties_to_false( $rest_args['schema'] );
+            $rest_args['schema'] = rest_default_additional_properties_to_false( $rest_args['schema'] );
 
             if ( ! in_array( $type, array( 'string', 'boolean', 'integer', 'number', 'array', 'object' ), true ) ) {
@@ -572 +572 @@
      *
      * @since 5.3.0
+     * @deprecated 5.6.0 Use rest_default_additional_properties_to_false() instead.
      *
      * @param array $schema The schema array.
@@ -577 +578 @@
      */
     protected function default_additional_properties_to_false( $schema ) {
-        switch ( $schema['type'] ) {
-            case 'object':
-                foreach ( $schema['properties'] as $key => $child_schema ) {
-                    $schema['properties'][ $key ] = $this->default_additional_properties_to_false( $child_schema );
-                }
-
-                if ( ! isset( $schema['additionalProperties'] ) ) {
-                    $schema['additionalProperties'] = false;
-                }
-                break;
-            case 'array':
-                $schema['items'] = $this->default_additional_properties_to_false( $schema['items'] );
-                break;
-        }
-
-        return $schema;
+        _deprecated_function( __METHOD__, '5.6.0', 'rest_default_additional_properties_to_false()' );
+
+        return rest_default_additional_properties_to_false( $schema );
     }