Changeset 46442

Timestamp:

10/08/2019 05:54:45 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Introduce the spread operator in Walker::walk() and ::paged_walk().

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

This re-applies [45624] and reverts [45640], with a dev note upcoming for plugin authors to maintain backward compatibility with old versions of WordPress.

Props jrf.
See #47678.

File:

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

trunk/src/wp-includes/class-wp-walker.php

@@ -181 +181 @@
          * @param array $elements  An array of elements.
          * @param int   $max_depth The maximum hierarchical depth.
+         * @param mixed ...$args   Optional additional arguments.
          * @return string The hierarchical item output.
          */
-        public function walk( $elements, $max_depth ) {
-                $args   = array_slice( func_get_args(), 2 );
+        public function walk( $elements, $max_depth, ...$args ) {
                 $output = '';
 
@@ -273 +273 @@
          * @param array $elements
          * @param int   $max_depth The maximum hierarchical depth.
-         * @param int   $page_num The specific page number, beginning with 1.
+         * @param int   $page_num  The specific page number, beginning with 1.
          * @param int   $per_page
+         * @param mixed ...$args   Optional additional arguments.
          * @return string XHTML of the specified page of elements
          */
-        public function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
+        public function paged_walk( $elements, $max_depth, $page_num, $per_page, ...$args ) {
                 if ( empty( $elements ) || $max_depth < -1 ) {
                         return '';
                 }
 
-                $args   = array_slice( func_get_args(), 4 );
                 $output = '';