Changeset 45623

Timestamp:

07/11/2019 11:47:56 PM (7 years ago)

Author:

pento

Message:

Code Modernisation: Introduce the spread operator in WP_User.

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/class-wp-user.php (modified) (3 diffs)

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

@@ -739 +739 @@
          *              the given capability for that object.
          */
-        public function has_cap( $cap ) {
+        public function has_cap( $cap, ...$args ) {
                 if ( is_numeric( $cap ) ) {
                         _deprecated_argument( __FUNCTION__, '2.0.0', __( 'Usage of user levels is deprecated. Use capabilities instead.' ) );
@@ -745 +745 @@
                 }
 
-                $args = array_slice( func_get_args(), 1 );
-                $args = array_merge( array( $cap, $this->ID ), $args );
-                $caps = call_user_func_array( 'map_meta_cap', $args );
+                $caps = map_meta_cap( $cap, $this->ID, ...$args );
 
                 // Multisite super admin has all caps by definition, Unless specifically denied.
@@ -756 +754 @@
                         return true;
                 }
+
+                // Maintain BC for the argument passed to the "user_has_cap" filter.
+                $args = array_merge( array( $cap, $this->ID ), $args );
 
                 /**