Changeset 55117

Timestamp:

01/23/2023 03:52:18 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Rename parameters that use reserved keywords in wp-includes/functions.php.

While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.

This commit:

• Renames the $array parameter to $input_array in wp_recursive_ksort().
• Moves the function next to other array-related functions for consistency.

Follow-up to [53129], [54929].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #56788.

File:

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

trunk/src/wp-includes/functions.php

@@ -4878 +4878 @@
 
 /**
+ * Sorts the keys of an array alphabetically.
+ *
+ * The array is passed by reference so it doesn't get returned
+ * which mimics the behavior of `ksort()`.
+ *
+ * @since 6.0.0
+ *
+ * @param array $input_array The array to sort, passed by reference.
+ */
+function wp_recursive_ksort( &$input_array ) {
+    foreach ( $input_array as &$value ) {
+        if ( is_array( $value ) ) {
+            wp_recursive_ksort( $value );
+        }
+    }
+
+    ksort( $input_array );
+}
+
+/**
  * Accesses an array in depth based on a path of keys.
  *
@@ -8430 +8450 @@
     return abs( (float) $expected - (float) $actual ) <= $precision;
 }
-
-/**
- * Sorts the keys of an array alphabetically.
- * The array is passed by reference so it doesn't get returned
- * which mimics the behavior of ksort.
- *
- * @since 6.0.0
- *
- * @param array $array The array to sort, passed by reference.
- */
-function wp_recursive_ksort( &$array ) {
-    foreach ( $array as &$value ) {
-        if ( is_array( $value ) ) {
-            wp_recursive_ksort( $value );
-        }
-    }
-    ksort( $array );
-}