From 654f8a867734c1324ce72a4135511bccc2c72033 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 15 Sep 2019 10:33:55 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@46123


git-svn-id: http://core.svn.wordpress.org/trunk@45935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/category-template.php | 22 ++++++++++++----------
 wp-includes/version.php           |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index e10545c862..56cbdf7b7f 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -1056,18 +1056,19 @@ function _wp_object_count_sort_cb( $a, $b ) {
  *
  * @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;
 	} else {
 		$walker = $args[2]['walker'];
 	}
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return $walker->walk( ...$args );
 }
 
 /**
@@ -1075,18 +1076,19 @@ function walk_category_tree() {
  *
  * @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;
 	} else {
 		$walker = $args[2]['walker'];
 	}
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return $walker->walk( ...$args );
 }
 
 //
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7d7f0c9a0b..c3ce673c8f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46122';
+$wp_version = '5.3-alpha-46123';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.