<!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>[42527] trunk: General: Allow `wp_list_pluck()` to operate on arrays of references without overwriting the referenced items.</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 { 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/42527">42527</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/42527","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-18 05:17:23 +0000 (Thu, 18 Jan 2018)</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'>General: Allow `wp_list_pluck()` to operate on arrays of references without overwriting the referenced items.
Fixes <a href="https://core.trac.wordpress.org/ticket/16895">#16895</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswplistutilphp">trunk/src/wp-includes/class-wp-list-util.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionslistFilterphp">trunk/tests/phpunit/tests/functions/listFilter.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswplistutilphp"></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/class-wp-list-util.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-list-util.php 2018-01-18 05:14:28 UTC (rev 42526)
+++ trunk/src/wp-includes/class-wp-list-util.php 2018-01-18 05:17:23 UTC (rev 42527)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,6 +140,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * `$list` will be preserved in the results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function pluck( $field, $index_key = null ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newlist = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $index_key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This is simple. Could at some point wrap array_column()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,11 +149,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->output as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $value ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->output[ $key ] = $value->$field;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newlist[ $key ] = $value->$field;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->output[ $key ] = $value[ $field ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newlist[ $key ] = $value[ $field ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->output = $newlist;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->output;
</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">@@ -159,7 +164,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When index_key is not set for a particular item, push the value
</span><span class="cx" style="display: block; padding: 0 10px"> * to the end of the stack. This is how array_column() behaves.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $newlist = array();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->output as $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $value->$index_key ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionslistFilterphp"></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/functions/listFilter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/listFilter.php 2018-01-18 05:14:28 UTC (rev 42526)
+++ trunk/tests/phpunit/tests/functions/listFilter.php 2018-01-18 05:17:23 UTC (rev 42527)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,6 +210,56 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 16895
+ */
+ function test_wp_list_pluck_containing_references() {
+ $ref_list = array(
+ & $this->object_list['foo'],
+ & $this->object_list['bar'],
+ );
+
+ $this->assertInstanceOf( 'stdClass', $ref_list[0] );
+ $this->assertInstanceOf( 'stdClass', $ref_list[1] );
+
+ $list = wp_list_pluck( $ref_list, 'name' );
+ $this->assertEquals(
+ array(
+ 'foo',
+ 'bar',
+ ),
+ $list
+ );
+
+ $this->assertInstanceOf( 'stdClass', $ref_list[0] );
+ $this->assertInstanceOf( 'stdClass', $ref_list[1] );
+ }
+
+ /**
+ * @ticket 16895
+ */
+ function test_wp_list_pluck_containing_references_keys() {
+ $ref_list = array(
+ & $this->object_list['foo'],
+ & $this->object_list['bar'],
+ );
+
+ $this->assertInstanceOf( 'stdClass', $ref_list[0] );
+ $this->assertInstanceOf( 'stdClass', $ref_list[1] );
+
+ $list = wp_list_pluck( $ref_list, 'name', 'id' );
+ $this->assertEquals(
+ array(
+ 'f' => 'foo',
+ 'b' => 'bar',
+ ),
+ $list
+ );
+
+ $this->assertInstanceOf( 'stdClass', $ref_list[0] );
+ $this->assertInstanceOf( 'stdClass', $ref_list[1] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_nested_array_and() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $list ) );
</span></span></pre>
</div>
</div>
</body>
</html>