WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code Modernisation: Introduce the spread operator in `widgets.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.

Built from https://develop.svn.wordpress.org/trunk@45629


git-svn-id: http://core.svn.wordpress.org/trunk@45440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-07-12 00:14:58 +00:00
parent afdbf749d7
commit 2fe355cdd0
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45628'; $wp_version = '5.3-alpha-45629';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

14
wp-includes/widgets.php
View File

@ -458,8 +458,6 @@ function wp_unregister_sidebar_widget( $id ) {
* *
* @since 2.2.0 * @since 2.2.0
* *
* @todo `$params` parameter?
*
* @global array $wp_registered_widget_controls * @global array $wp_registered_widget_controls
* @global array $wp_registered_widget_updates * @global array $wp_registered_widget_updates
* @global array $wp_registered_widgets * @global array $wp_registered_widgets
@ -479,7 +477,7 @@ function wp_unregister_sidebar_widget( $id ) {
* } * }
* @param mixed ...$params Optional additional parameters to pass to the callback function when it's called. * @param mixed ...$params Optional additional parameters to pass to the callback function when it's called.
*/ */
function wp_register_widget_control( $id, $name, $control_callback, $options = array() ) { function wp_register_widget_control( $id, $name, $control_callback, $options = array(), ...$params ) {
global $wp_registered_widget_controls, $wp_registered_widget_updates, $wp_registered_widgets, $_wp_deprecated_widgets_callbacks; global $wp_registered_widget_controls, $wp_registered_widget_updates, $wp_registered_widgets, $_wp_deprecated_widgets_callbacks;
$id = strtolower( $id ); $id = strtolower( $id );
@ -512,7 +510,7 @@ function wp_register_widget_control( $id, $name, $control_callback, $options = a
'name' => $name, 'name' => $name,
'id' => $id, 'id' => $id,
'callback' => $control_callback, 'callback' => $control_callback,
'params' => array_slice( func_get_args(), 4 ), 'params' => $params,
); );
$widget = array_merge( $widget, $options ); $widget = array_merge( $widget, $options );
@ -543,7 +541,7 @@ function wp_register_widget_control( $id, $name, $control_callback, $options = a
* Default empty array. * Default empty array.
* @param mixed ...$params Optional additional parameters to pass to the callback function when it's called. * @param mixed ...$params Optional additional parameters to pass to the callback function when it's called.
*/ */
function _register_widget_update_callback( $id_base, $update_callback, $options = array() ) { function _register_widget_update_callback( $id_base, $update_callback, $options = array(), ...$params ) {
global $wp_registered_widget_updates; global $wp_registered_widget_updates;
if ( isset( $wp_registered_widget_updates[ $id_base ] ) ) { if ( isset( $wp_registered_widget_updates[ $id_base ] ) ) {
@ -555,7 +553,7 @@ function _register_widget_update_callback( $id_base, $update_callback, $options
$widget = array( $widget = array(
'callback' => $update_callback, 'callback' => $update_callback,
'params' => array_slice( func_get_args(), 3 ), 'params' => $params,
); );
$widget = array_merge( $widget, $options ); $widget = array_merge( $widget, $options );
@ -577,7 +575,7 @@ function _register_widget_update_callback( $id_base, $update_callback, $options
* @param mixed ...$params Optional additional parameters to pass to the callback function when it's called. * @param mixed ...$params Optional additional parameters to pass to the callback function when it's called.
*/ */
function _register_widget_form_callback( $id, $name, $form_callback, $options = array() ) { function _register_widget_form_callback( $id, $name, $form_callback, $options = array(), ...$params ) {
global $wp_registered_widget_controls; global $wp_registered_widget_controls;
$id = strtolower( $id ); $id = strtolower( $id );
@ -603,7 +601,7 @@ function _register_widget_form_callback( $id, $name, $form_callback, $options =
'name' => $name, 'name' => $name,
'id' => $id, 'id' => $id,
'callback' => $form_callback, 'callback' => $form_callback,
'params' => array_slice( func_get_args(), 4 ), 'params' => $params,
); );
$widget = array_merge( $widget, $options ); $widget = array_merge( $widget, $options );