<!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>[57732] trunk: General: Revert r57698 for WP_List_Util::pluck().</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/57732">57732</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/57732","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-27 22:36:09 +0000 (Tue, 27 Feb 2024)</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: Revert <a href="https://core.trac.wordpress.org/changeset/57698">r57698</a> for WP_List_Util::pluck().
<a href="https://core.trac.wordpress.org/changeset/57698">r57698</a> caused a regression for arrays of objects which have magic methods and dynamic properties. A fix is identified.
However, a deeper dive discovered additional scenarios which will require a different fix.
Reverting gives more time for resolving these scenarios and more soak time to discover if there are others.
Props dd32, jamescollins, swissspidy.
See <a href="https://core.trac.wordpress.org/ticket/59774">#59774</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="#trunktestsphpunittestsfunctionswpListPluckphp">trunk/tests/phpunit/tests/functions/wpListPluck.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 2024-02-27 21:03:54 UTC (rev 57731)
+++ trunk/src/wp-includes/class-wp-list-util.php 2024-02-27 22:36:09 UTC (rev 57732)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,13 +165,9 @@
</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">- if ( property_exists( $value, $field ) ) {
- $newlist[ $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"> } elseif ( is_array( $value ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( array_key_exists( $field, $value ) ) {
- $newlist[ $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><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,20 +188,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( property_exists( $value, $field ) ) {
- if ( property_exists( $value, $index_key ) ) {
- $newlist[ $value->$index_key ] = $value->$field;
- } else {
- $newlist[] = $value->$field;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $value->$index_key ) ) {
+ $newlist[ $value->$index_key ] = $value->$field;
+ } else {
+ $newlist[] = $value->$field;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $value ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( array_key_exists( $field, $value ) ) {
- if ( array_key_exists( $index_key, $value ) ) {
- $newlist[ $value[ $index_key ] ] = $value[ $field ];
- } else {
- $newlist[] = $value[ $field ];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $value[ $index_key ] ) ) {
+ $newlist[ $value[ $index_key ] ] = $value[ $field ];
+ } else {
+ $newlist[] = $value[ $field ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpListPluckphp"></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/wpListPluck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpListPluck.php 2024-02-27 21:03:54 UTC (rev 57731)
+++ trunk/tests/phpunit/tests/functions/wpListPluck.php 2024-02-27 22:36:09 UTC (rev 57732)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,6 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'abc' => 'xyz',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo' => 'foo',
</ins><span class="cx" style="display: block; padding: 0 10px"> '123' => '456',
</span><span class="cx" style="display: block; padding: 0 10px"> 'lorem' => 'ipsum',
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,34 +285,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'key',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bar' => 'foo',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'baz',
</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">- 'arrays with key missing' => array(
- array(
- array(
- 'foo' => 'bar',
- 'bar' => 'baz',
- 'abc' => 'xyz',
- ),
- array(
- 'foo' => 'foo',
- '123' => '456',
- 'lorem' => 'ipsum',
- 'key' => 'bar',
- ),
- array(
- 'foo' => 'baz',
- 'key' => 'value',
- ),
- ),
- 'key',
- null,
- array(
- 1 => 'bar',
- 2 => 'value',
- ),
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'objects' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,6 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'abc' => 'xyz',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo' => 'foo',
</ins><span class="cx" style="display: block; padding: 0 10px"> '123' => '456',
</span><span class="cx" style="display: block; padding: 0 10px"> 'lorem' => 'ipsum',
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,34 +356,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'key',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bar' => 'foo',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'baz',
</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">- 'objects with field missing' => array(
- array(
- (object) array(
- 'foo' => 'bar',
- 'bar' => 'baz',
- 'abc' => 'xyz',
- ),
- (object) array(
- 'foo' => 'foo',
- '123' => '456',
- 'lorem' => 'ipsum',
- 'key' => 'bar',
- ),
- (object) array(
- 'foo' => 'baz',
- 'key' => 'value',
- ),
- ),
- 'key',
- null,
- array(
- 1 => 'bar',
- 2 => 'value',
- ),
- ),
</del><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>