<!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>[46127] trunk/tests/phpunit: Code Modernisation: Introduce the spread operator in `tests/phpunit/*`.</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/46127">46127</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/46127","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:03:45 +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 `tests/phpunit/*`.
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 <a href="https://core.trac.wordpress.org/ticket/47678">#47678</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestshooksdoActionphp">trunk/tests/phpunit/tests/hooks/doAction.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2019-09-15 10:44:58 UTC (rev 46126)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2019-09-15 11:03:45 UTC (rev 46127)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,7 +903,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks each of the WP_Query is_* functions/properties against expected boolean value.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Any properties that are listed by name as parameters will be expected to be true; all others are
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * expected to be false. For example, assertQueryTrue('is_single', 'is_feed') means is_single()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * expected to be false. For example, assertQueryTrue( 'is_single', 'is_feed' ) means is_single()
</ins><span class="cx" style="display: block; padding: 0 10px"> * and is_feed() must be true and everything else must be false to pass.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,9 +911,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string ...$prop Any number of WP_Query properties that are expected to be true for the current request.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function assertQueryTrue() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function assertQueryTrue( ...$prop ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $all = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $all = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'is_404',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_admin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_archive',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,9 +945,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_trackback',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_year',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $true = func_get_args();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $true as $true_thing ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $prop as $true_thing ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $true_thing, $all, "Unknown conditional: {$true_thing}." );
</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">@@ -956,7 +956,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all as $query_thing ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->$query_thing;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $query_thing, $true, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $query_thing, $prop, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= $query_thing . ' is false but is expected to be true. ' . PHP_EOL;
</span><span class="cx" style="display: block; padding: 0 10px"> $passed = false;
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/utils.php 2019-09-15 10:44:58 UTC (rev 46126)
+++ trunk/tests/phpunit/includes/utils.php 2019-09-15 11:03:45 UTC (rev 46127)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,17 +128,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $arg . '_append';
</span><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">- function filterall( $tag, $arg = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function filterall( $tag, ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // this one doesn't return the result, so it's safe to use with the new 'all' filter
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->debug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> dmp( __FUNCTION__, $this->current_filter() );
</span><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">- $args = func_get_args();
</del><span class="cx" style="display: block; padding: 0 10px"> $this->events[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag' => $tag,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'args' => array_slice( $args, 1 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'args' => $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">@@ -244,10 +243,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $p->data;
</span><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">-function xml_find( $tree /*, $el1, $el2, $el3, .. */ ) {
- $a = func_get_args();
- $a = array_slice( $a, 1 );
- $n = count( $a );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function xml_find( $tree, ...$elements ) {
+ $n = count( $elements );
</ins><span class="cx" style="display: block; padding: 0 10px"> $out = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $n < 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,17 +252,15 @@
</span><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"> for ( $i = 0; $i < count( $tree ); $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # echo "checking '{$tree[$i][name]}' == '{$a[0]}'\n";
- # var_dump($tree[$i]['name'], $a[0]);
- if ( $tree[ $i ]['name'] === $a[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # echo "checking '{$tree[$i][name]}' == '{$elements[0]}'\n";
+ # var_dump( $tree[$i]['name'], $elements[0] );
+ if ( $tree[ $i ]['name'] === $elements[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> # echo "n == {$n}\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === $n ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out[] = $tree[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subtree =& $tree[ $i ]['child'];
- $call_args = array( $subtree );
- $call_args = array_merge( $call_args, array_slice( $a, 1 ) );
- $out = array_merge( $out, call_user_func_array( 'xml_find', $call_args ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subtree =& $tree[ $i ]['child'];
+ $out = array_merge( $out, xml_find( $subtree, ...array_slice( $elements, 1 ) ) );
</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">@@ -300,9 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</span><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">-function dmp() {
- $args = func_get_args();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function dmp( ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args as $thing ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo ( is_scalar( $thing ) ? strval( $thing ) : var_export( $thing, true ) ), "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2019-09-15 10:44:58 UTC (rev 46126)
+++ trunk/tests/phpunit/tests/customize/manager.php 2019-09-15 11:03:45 UTC (rev 46127)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2541,10 +2541,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Capture the actions fired when calling WP_Customize_Manager::set_post_value().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Tests_WP_Customize_Manager::test_set_post_value()
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param mixed ...$args Optional arguments passed to the action.
</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 capture_customize_post_value_set_actions() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function capture_customize_post_value_set_actions( ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = current_action();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = func_get_args();
</del><span class="cx" style="display: block; padding: 0 10px"> $this->captured_customize_post_value_set_actions[] = compact( 'action', 'args' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshooksdoActionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/hooks/doAction.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/doAction.php 2019-09-15 10:44:58 UTC (rev 46126)
+++ trunk/tests/phpunit/tests/hooks/doAction.php 2019-09-15 11:03:45 UTC (rev 46127)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,9 +164,10 @@
</span><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"> * Use this rather than MockAction so we can test callbacks with no args
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param mixed ...$args Optional arguments passed to the action.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _action_callback() {
- $args = func_get_args();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _action_callback( ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->events[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => $args,
</span></span></pre>
</div>
</div>
</body>
</html>