Changeset 42527

Timestamp:

01/18/2018 05:17:23 AM (7 years ago)

Author:

dd32

Message:

General: Allow wp_list_pluck() to operate on arrays of references without overwriting the referenced items.

Fixes #16895.

Location:

trunk

Files:

• src/wp-includes/class-wp-list-util.php (modified) (3 diffs)
• tests/phpunit/tests/functions/listFilter.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-list-util.php

@@ -141 +141 @@
      */
     public function pluck( $field, $index_key = null ) {
+        $newlist = array();
+
         if ( ! $index_key ) {
             /*
@@ -148 +150 @@
             foreach ( $this->output as $key => $value ) {
                 if ( is_object( $value ) ) {
-                    $this->output[ $key ] = $value->$field;
+                    $newlist[ $key ] = $value->$field;
                 } else {
-                    $this->output[ $key ] = $value[ $field ];
-                }
-            }
+                    $newlist[ $key ] = $value[ $field ];
+                }
+            }
+
+            $this->output = $newlist;
+
             return $this->output;
         }
@@ -160 +165 @@
          * to the end of the stack. This is how array_column() behaves.
          */
-        $newlist = array();
         foreach ( $this->output as $value ) {
             if ( is_object( $value ) ) {

trunk/tests/phpunit/tests/functions/listFilter.php

@@ -211 +211 @@
     }
 
+    /**
+     * @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] );
+    }
+
     function test_filter_object_list_nested_array_and() {
         $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );