Changeset 49257 for trunk/src/wp-includes/rest-api/class-wp-rest-server.php

Timestamp:

10/20/2020 08:17:20 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Make sure all supported JSON Schema keywords are output in the index.

Previously, only a small subset of keywords were exposed which limited the utility of OPTIONS requests.

Props raubvogel, TimothyBlynJacobs.
Fixes #51020.

File:

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

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

@@ -1381 +1381 @@
         }
 
+        $allowed_schema_keywords = array_flip( rest_get_allowed_schema_keywords() );
+
         $route = preg_replace( '#\(\?P<(\w+?)>.*?\)#', '{$1}', $route );
 
@@ -1398 +1400 @@
 
                 foreach ( $callback['args'] as $key => $opts ) {
-                    $arg_data = array(
-                        'required' => ! empty( $opts['required'] ),
-                    );
-                    if ( isset( $opts['default'] ) ) {
-                        $arg_data['default'] = $opts['default'];
-                    }
-                    if ( isset( $opts['enum'] ) ) {
-                        $arg_data['enum'] = $opts['enum'];
-                    }
-                    if ( isset( $opts['description'] ) ) {
-                        $arg_data['description'] = $opts['description'];
-                    }
-                    if ( isset( $opts['type'] ) ) {
-                        $arg_data['type'] = $opts['type'];
-                    }
-                    if ( isset( $opts['items'] ) ) {
-                        $arg_data['items'] = $opts['items'];
-                    }
+                    $arg_data             = array_intersect_key( $opts, $allowed_schema_keywords );
+                    $arg_data['required'] = ! empty( $opts['required'] );
+
                     $endpoint_data['args'][ $key ] = $arg_data;
                 }