From 169204a8e06a9c4a799a3ae5d232c3506cdb1ef4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 14 Oct 2022 15:55:11 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@54518


git-svn-id: http://core.svn.wordpress.org/trunk@54073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/rest-api.php | 25 ++++++++++++++-----------
 wp-includes/version.php  |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php
index ae1e714ea8..1d6b8a7e68 100644
--- a/wp-includes/rest-api.php
+++ b/wp-includes/rest-api.php
@@ -104,17 +104,20 @@ function register_rest_route( $namespace, $route, $args = array(), $override = f
 			);
 		}
 
-		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.
+			}
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1eb550cfef..00317eacc5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-RC1-54517';
+$wp_version = '6.1-RC1-54518';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.