Changeset 46128

Timestamp:

09/15/2019 11:05:31 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Introduce the spread operator in wp-includes/formatting.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/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -4837 +4837 @@
  * @return string The formatted string.
  */
-function wp_sprintf( $pattern ) {
-    $args      = func_get_args();
+function wp_sprintf( $pattern, ...$args ) {
     $len       = strlen( $pattern );
     $start     = 0;
@@ -4868 +4867 @@
             // Find numbered arguments or take the next one in order
             if ( preg_match( '/^%(\d+)\$/', $fragment, $matches ) ) {
-                $arg      = isset( $args[ $matches[1] ] ) ? $args[ $matches[1] ] : '';
+                $index    = $matches[1] - 1; // 0-based array vs 1-based sprintf arguments.
+                $arg      = isset( $args[ $index ] ) ? $args[ $index ] : '';
                 $fragment = str_replace( "%{$matches[1]}$", '%', $fragment );
             } else {
+                $arg = isset( $args[ $arg_index ] ) ? $args[ $arg_index ] : '';
                 ++$arg_index;
-                $arg = isset( $args[ $arg_index ] ) ? $args[ $arg_index ] : '';
             }