Changeset 46138

Timestamp:

09/15/2019 11:40:08 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Replace call_user_func_array() in wp-admin/includes/widgets.php and associated unit tests with a direct function call.

Props jrf.
See #47678.

Location:

trunk

Files:

• src/wp-admin/includes/widgets.php (modified) (2 diffs)
• tests/phpunit/tests/widgets.php (modified) (2 diffs)

trunk/src/wp-admin/includes/widgets.php

@@ -52 +52 @@
                 }
 
-                $args = wp_list_widget_controls_dynamic_sidebar(
-                        array(
-                                0 => $args,
-                                1 => $widget['params'][0],
-                        )
+                $control_args = array(
+                        0 => $args,
+                        1 => $widget['params'][0],
                 );
-                call_user_func_array( 'wp_widget_control', $args );
+                $sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );
+
+                wp_widget_control( ...$sidebar_args );
         }
 }
@@ -145 +145 @@
         $params[0]['before_title']  = '%BEG_OF_TITLE%'; // deprecated
         $params[0]['after_title']   = '%END_OF_TITLE%'; // deprecated
+
         if ( is_callable( $wp_registered_widgets[ $widget_id ]['callback'] ) ) {
                 $wp_registered_widgets[ $widget_id ]['_callback'] = $wp_registered_widgets[ $widget_id ]['callback'];

trunk/tests/phpunit/tests/widgets.php

@@ -621 +621 @@
                 wp_widgets_init();
                 require_once ABSPATH . '/wp-admin/includes/widgets.php';
-                $widget_id = 'search-2';
-                $widget    = $wp_registered_widgets[ $widget_id ];
-                $params    = array(
+                $widget_id    = 'search-2';
+                $widget       = $wp_registered_widgets[ $widget_id ];
+                $params       = array(
                         'widget_id'   => $widget['id'],
                         'widget_name' => $widget['name'],
                 );
-                $args      = wp_list_widget_controls_dynamic_sidebar(
-                        array(
-                                0 => $params,
-                                1 => $widget['params'][0],
-                        )
-                );
+                $control_args = array(
+                        0 => $params,
+                        1 => $widget['params'][0],
+                );
+                $sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );
 
                 ob_start();
-                call_user_func_array( 'wp_widget_control', $args );
+                wp_widget_control( ...$sidebar_args );
                 $control = ob_get_clean();
                 $this->assertNotEmpty( $control );
@@ -660 +659 @@
                 );
                 $params          = array_merge( $params, $param_overrides );
-                $args            = wp_list_widget_controls_dynamic_sidebar(
-                        array(
-                                0 => $params,
-                                1 => $widget['params'][0],
-                        )
-                );
+                $control_args    = array(
+                        0 => $params,
+                        1 => $widget['params'][0],
+                );
+                $sidebar_args    = wp_list_widget_controls_dynamic_sidebar( $control_args );
 
                 ob_start();
-                call_user_func_array( 'wp_widget_control', $args );
+                wp_widget_control( ...$sidebar_args );
                 $control = ob_get_clean();
                 $this->assertNotEmpty( $control );