Changeset 36100

Timestamp:

12/26/2015 05:21:14 AM (11 years ago)

Author:

dd32

Message:

Allow map_deep() to work with object properties containing a reference. Restores the previous behaviour of stripslashes_deep().

Props jeff@…, swissspidy.
See #22300, [35252].
Fixes #35058.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/MapDeep.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -3885 +3885 @@
  */
 function map_deep( $value, $callback ) {
-        if ( is_array( $value ) || is_object( $value ) ) {
-                foreach ( $value as &$item ) {
-                        $item = map_deep( $item, $callback );
-                }
-                return $value;
+        if ( is_array( $value ) ) {
+                foreach ( $value as $index => $item ) {
+                        $value[ $index ] = map_deep( $item, $callback );
+                }
+        } elseif ( is_object( $value ) ) {
+                $object_vars = get_object_vars( $value );
+                foreach ( $object_vars as $property_name => $property_value ) {
+                        $value->$property_name = map_deep( $property_value, $callback );
+                }
         } else {
-                return call_user_func( $callback, $value );
-        }
+                $value = call_user_func( $callback, $value );
+        }
+
+        return $value;
 }
 

trunk/tests/phpunit/tests/formatting/MapDeep.php

@@ -95 +95 @@
         }
 
+        /**
+         * @ticket 35058
+         */
+        public function test_map_deep_should_map_object_properties_passed_by_reference() {
+                $object_a = (object) array( 'var0' => 'a' );
+                $object_b = (object) array( 'var0' => &$object_a->var0, 'var1' => 'x' );
+                $this->assertEquals( (object) array(
+                        'var0' => 'ababa',
+                        'var1' => 'xbaba',
+                ), map_deep( $object_b, array( $this, 'append_baba' ) ) );
+        }
+
+        /**
+         * @ticket 35058
+         */
+        public function test_map_deep_should_map_array_elements_passed_by_reference() {
+                $array_a = array( 'var0' => 'a' );
+                $array_b = array( 'var0' => &$array_a['var0'], 'var1' => 'x' );
+                $this->assertEquals( array(
+                        'var0' => 'ababa',
+                        'var1' => 'xbaba',
+                ), map_deep( $array_b, array( $this, 'append_baba' ) ) );
+        }
+
         public function append_baba( $value ) {
                 return $value . 'baba';