Changeset 46123 for trunk/src/wp-includes/category-template.php

Timestamp:

09/15/2019 10:32:54 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Introduce the spread operator in wp-includes/category-template.php.

Rather than relying func_get_args() to retrieve arbitrary function arguments, we can now use the spread operator to assign them directly to a variable.

Props jrf.
See #47678.

File:

• trunk/src/wp-includes/category-template.php (modified) (4 diffs)

trunk/src/wp-includes/category-template.php

@@ -1057 +1057 @@
  * @uses Walker_Category to create HTML list content.
  * @since 2.1.0
- * @see Walker_Category::walk() for parameters and return description.
+ * @see Walker::walk() for parameters and return description.
+ *
+ * @param mixed ...$args Elements array, maximum hierarchical depth and optional additional arguments.
  * @return string
  */
-function walk_category_tree() {
-    $args = func_get_args();
-    // the user's options are the third parameter
+function walk_category_tree( ...$args ) {
+    // The user's options are the third parameter.
     if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
         $walker = new Walker_Category;
@@ -1068 +1069 @@
         $walker = $args[2]['walker'];
     }
-    return call_user_func_array( array( $walker, 'walk' ), $args );
+    return $walker->walk( ...$args );
 }
 
@@ -1076 +1077 @@
  * @uses Walker_CategoryDropdown to create HTML dropdown content.
  * @since 2.1.0
- * @see Walker_CategoryDropdown::walk() for parameters and return description.
+ * @see Walker::walk() for parameters and return description.
+ *
+ * @param mixed ...$args Elements array, maximum hierarchical depth and optional additional arguments.
  * @return string
  */
-function walk_category_dropdown_tree() {
-    $args = func_get_args();
-    // the user's options are the third parameter
+function walk_category_dropdown_tree( ...$args ) {
+    // The user's options are the third parameter.
     if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
         $walker = new Walker_CategoryDropdown;
@@ -1087 +1089 @@
         $walker = $args[2]['walker'];
     }
-    return call_user_func_array( array( $walker, 'walk' ), $args );
+    return $walker->walk( ...$args );
 }