Changeset 45622

Timestamp:

07/11/2019 11:45:22 PM (5 years ago)

Author:

pento

Message:

Code Modernisation: Introduce the spread operator in capabilities.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/capabilities.php (modified) (9 diffs)

trunk/src/wp-includes/capabilities.php

@@ -34 +34 @@
  * @return array Actual capabilities for meta capability.
  */
-function map_meta_cap( $cap, $user_id ) {
-    $args = array_slice( func_get_args(), 2 );
+function map_meta_cap( $cap, $user_id, ...$args ) {
     $caps = array();
 
@@ -650 +649 @@
  *              passed, whether the current user has the given meta capability for the given object.
  */
-function current_user_can( $capability ) {
+function current_user_can( $capability, ...$args ) {
     $current_user = wp_get_current_user();
 
@@ -657 +656 @@
     }
 
-    $args = array_slice( func_get_args(), 1 );
-    $args = array_merge( array( $capability ), $args );
-
-    return call_user_func_array( array( $current_user, 'has_cap' ), $args );
+    return $current_user->has_cap( $capability, ...$args );
 }
 
@@ -683 +679 @@
  * @return bool Whether the user has the given capability.
  */
-function current_user_can_for_blog( $blog_id, $capability ) {
+function current_user_can_for_blog( $blog_id, $capability, ...$args ) {
     $switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
 
@@ -695 +691 @@
     }
 
-    $args = array_slice( func_get_args(), 2 );
-    $args = array_merge( array( $capability ), $args );
-
-    $can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+    $can = $current_user->has_cap( $capability, ...$args );
 
     if ( $switched ) {
@@ -727 +720 @@
  * @return bool Whether the post author has the given capability.
  */
-function author_can( $post, $capability ) {
+function author_can( $post, $capability, ...$args ) {
     $post = get_post( $post );
     if ( ! $post ) {
@@ -739 +732 @@
     }
 
-    $args = array_slice( func_get_args(), 2 );
-    $args = array_merge( array( $capability ), $args );
-
-    return call_user_func_array( array( $author, 'has_cap' ), $args );
+    return $author->has_cap( $capability, ...$args );
 }
 
@@ -765 +755 @@
  * @return bool Whether the user has the given capability.
  */
-function user_can( $user, $capability ) {
+function user_can( $user, $capability, ...$args ) {
     if ( ! is_object( $user ) ) {
         $user = get_userdata( $user );
@@ -774 +764 @@
     }
 
-    $args = array_slice( func_get_args(), 2 );
-    $args = array_merge( array( $capability ), $args );
-
-    return call_user_func_array( array( $user, 'has_cap' ), $args );
+    return $user->has_cap( $capability, ...$args );
 }