Changeset 54518

Timestamp:

10/14/2022 03:53:33 PM (4 years ago)

Author:

SergeyBiryukov

Message:

REST API: Simplify the check for an array of arrays in register_rest_route().

The previous implementation of checking whether the args parameter is an array of arrays used array_filter(), which would always loop the full array, even though we are only interested in finding one (the first) non-array to display a _doing_it_wrong() message.

This commit aims to improve readability and performance of this check by using a foreach loop instead, leaving it as soon as the first non-array argument is found.

Follow-up to [54339].

Props TobiasBg, audrasjb, costdev, SergeyBiryukov.
Fixes #56804.

File:

• trunk/src/wp-includes/rest-api.php (modified) (1 diff)

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

@@ -105 +105 @@
                 }
 
-                if ( count( array_filter( $arg_group['args'], 'is_array' ) ) !== count( $arg_group['args'] ) ) {
-                        _doing_it_wrong(
-                                __FUNCTION__,
-                                sprintf(
-                                        /* translators: 1: $args, 2: The REST API route being registered. */
-                                        __( 'REST API %1$s should be an array of arrays. Non-array value detected for %2$s.' ),
-                                        '<code>$args</code>',
-                                        '<code>' . $clean_namespace . '/' . trim( $route, '/' ) . '</code>'
-                                ),
-                                '6.1.0'
-                        );
+                foreach ( $arg_group['args'] as $arg ) {
+                        if ( ! is_array( $arg ) ) {
+                                _doing_it_wrong(
+                                        __FUNCTION__,
+                                        sprintf(
+                                                /* translators: 1: $args, 2: The REST API route being registered. */
+                                                __( 'REST API %1$s should be an array of arrays. Non-array value detected for %2$s.' ),
+                                                '<code>$args</code>',
+                                                '<code>' . $clean_namespace . '/' . trim( $route, '/' ) . '</code>'
+                                        ),
+                                        '6.1.0'
+                                );
+                                break; // Leave the foreach loop once a non-array argument was found.
+                        }
                 }
         }