Changeset 46144

Timestamp:

09/15/2019 11:53:01 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Replace call_user_func_array() in various __call() methods with dynamic function calls.

The callback in these functions is always checked against a limited list of valid callbacks that can be safely changed to dynamic function calls.

Props jrf.
See #47678.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-list-table.php (modified) (1 diff)
• wp-includes/class-wp-comment-query.php (modified) (1 diff)
• wp-includes/class-wp-oembed.php (modified) (1 diff)
• wp-includes/class-wp-query.php (modified) (1 diff)
• wp-includes/class-wp-roles.php (modified) (1 diff)
• wp-includes/class-wp-user-query.php (modified) (1 diff)
• wp-includes/class-wp-user.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -240 +240 @@
     public function __call( $name, $arguments ) {
         if ( in_array( $name, $this->compat_methods ) ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->$name( ...$arguments );
         }
         return false;

trunk/src/wp-includes/class-wp-comment-query.php

@@ -125 +125 @@
     public function __call( $name, $arguments ) {
         if ( 'get_search_sql' === $name ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->get_search_sql( ...$arguments );
         }
         return false;

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

@@ -236 +236 @@
     public function __call( $name, $arguments ) {
         if ( in_array( $name, $this->compat_methods ) ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->$name( ...$arguments );
         }
         return false;

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

@@ -3562 +3562 @@
     public function __call( $name, $arguments ) {
         if ( in_array( $name, $this->compat_methods ) ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->$name( ...$arguments );
         }
         return false;

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

@@ -102 +102 @@
     public function __call( $name, $arguments ) {
         if ( '_init' === $name ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->_init( ...$arguments );
         }
         return false;

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

@@ -886 +886 @@
     public function __call( $name, $arguments ) {
         if ( 'get_search_sql' === $name ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->get_search_sql( ...$arguments );
         }
         return false;

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

@@ -445 +445 @@
     public function __call( $name, $arguments ) {
         if ( '_init_caps' === $name ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->_init_caps( ...$arguments );
         }
         return false;

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -178 +178 @@
     public function __call( $name, $arguments ) {
         if ( '_multisite_getUsersBlogs' === $name ) {
-            return call_user_func_array( array( $this, $name ), $arguments );
+            return $this->_multisite_getUsersBlogs( ...$arguments );
         }
         return false;