Changeset 46125 for trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php

Timestamp:

09/15/2019 10:41:03 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Introduce the spread operator in wp-admin/includes/class-*-upgrader-skin.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-admin/includes/class-wp-ajax-upgrader-skin.php (modified) (5 diffs)

trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php

@@ -79 +79 @@
      * @since 4.6.0
      *
-     * @param string|WP_Error $errors Errors.
+     * @param string|WP_Error $errors  Errors.
+     * @param mixed           ...$args Optional text replacements.
      */
-    public function error( $errors ) {
+    public function error( $errors, ...$args ) {
         if ( is_string( $errors ) ) {
             $string = $errors;
@@ -89 +90 @@
 
             if ( false !== strpos( $string, '%' ) ) {
-                $args = func_get_args();
-                $args = array_splice( $args, 1 );
                 if ( ! empty( $args ) ) {
                     $string = vsprintf( $string, $args );
@@ -105 +104 @@
         }
 
-        $args = func_get_args();
-        call_user_func_array( array( $this, 'parent::error' ), $args );
+        parent::error( $errors, ...$args );
     }
 
@@ -114 +112 @@
      * @since 4.6.0
      *
-     * @param string|array|WP_Error $data Log entry data.
+     * @param string|array|WP_Error $data    Log entry data.
+     * @param mixed                 ...$args Optional text replacements.
      */
-    public function feedback( $data ) {
+    public function feedback( $data, ...$args ) {
         if ( is_wp_error( $data ) ) {
             foreach ( $data->get_error_codes() as $error_code ) {
@@ -123 +122 @@
         }
 
-        $args = func_get_args();
-        call_user_func_array( array( $this, 'parent::feedback' ), $args );
+        parent::feedback( $data, ...$args );
     }
 }