<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46129] trunk/src/wp-includes/deprecated.php: Code Modernisation: Introduce the spread operator in `wp-includes/deprecated.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46129">46129</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46129","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-15 11:08:02 +0000 (Sun, 15 Sep 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Code Modernisation: Introduce the spread operator in `wp-includes/deprecated.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.
While these functions are deprecated, they can still get a minor performance boost in case they are being called.
Props jrf.
See <a href="https://core.trac.wordpress.org/ticket/47678">#47678</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2019-09-15 11:05:31 UTC (rev 46128)
+++ trunk/src/wp-includes/deprecated.php 2019-09-15 11:08:02 UTC (rev 46129)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1798,10 +1798,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.8.0 Use _n()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _n()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function __ngettext() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function __ngettext( ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.8.0', '_n()' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = func_get_args();
- return call_user_func_array('_n', $args);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return _n( ...$args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1811,10 +1810,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.8.0 Use _n_noop()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _n_noop()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function __ngettext_noop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function __ngettext_noop( ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.8.0', '_n_noop()' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = func_get_args();
- return call_user_func_array('_n_noop', $args);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return _n_noop( ...$args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2076,8 +2074,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.8.0', 'esc_html()' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( func_num_args() > 1 ) { // Maintain back-compat for people passing additional arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = func_get_args();
- return call_user_func_array( '_wp_specialchars', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return _wp_specialchars( $string, $quote_style, $charset, $double_encode );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return esc_html( $string );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2117,26 +2114,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $classname Optional. Classname widget option. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed ...$params Widget parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function register_sidebar_widget($name, $output_callback, $classname = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function register_sidebar_widget($name, $output_callback, $classname = '', ...$params) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Compat
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array($name) ) {
- if ( count($name) == 3 )
- $name = sprintf($name[0], $name[2]);
- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $name ) ) {
+ if ( count( $name ) === 3 ) {
+ $name = sprintf( $name[0], $name[2] );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = $name[0];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = sanitize_title($name);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = sanitize_title( $name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $options = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty($classname) && is_string($classname) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $classname ) && is_string( $classname ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $options['classname'] = $classname;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $params = array_slice(func_get_args(), 2);
- $args = array($id, $name, $output_callback, $options);
- if ( !empty($params) )
- $args = array_merge($args, $params);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- call_user_func_array('wp_register_sidebar_widget', $args);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_register_sidebar_widget( $id, $name, $output_callback, $options, ...$params );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2167,33 +2162,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.8.0 Use wp_register_widget_control()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_register_widget_control()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|string $name Sidebar ID.
- * @param callable $control_callback Widget control callback to display and process form.
- * @param int $width Widget width.
- * @param int $height Widget height.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|string $name Sidebar ID.
+ * @param callable $control_callback Widget control callback to display and process form.
+ * @param int $width Widget width.
+ * @param int $height Widget height.
+ * @param mixed ...$params Widget parameters.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function register_widget_control($name, $control_callback, $width = '', $height = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function register_widget_control($name, $control_callback, $width = '', $height = '', ...$params) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Compat
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array($name) ) {
- if ( count($name) == 3 )
- $name = sprintf($name[0], $name[2]);
- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $name ) ) {
+ if ( count( $name ) === 3 ) {
+ $name = sprintf( $name[0], $name[2] );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = $name[0];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = sanitize_title($name);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = sanitize_title( $name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $options = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty($width) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $width ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $options['width'] = $width;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty($height) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( ! empty( $height ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $options['height'] = $height;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $params = array_slice(func_get_args(), 4);
- $args = array($id, $name, $control_callback, $options);
- if ( !empty($params) )
- $args = array_merge($args, $params);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- call_user_func_array('wp_register_widget_control', $args);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_register_widget_control( $id, $name, $control_callback, $options, ...$params );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>