Modified: php/php-src/branches/PHP_5_3/ext/json/tests/003.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/json/tests/003.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/json/tests/003.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -21,10 +21,7 @@
   [0]=>
   &array(1) {
     [0]=>
-    &array(1) {
-      [0]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }


Modified: php/php-src/branches/PHP_5_3/ext/json/tests/004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/json/tests/004.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/json/tests/004.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -16,10 +16,7 @@
 --EXPECTF--
 object(stdClass)#%d (1) {
   ["prop"]=>
-  object(stdClass)#%d (1) {
-    ["prop"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }

 Warning: json_encode(): recursion detected in %s on line %d

Modified: php/php-src/branches/PHP_5_3/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -22,51 +22,30 @@
 include("round3_groupE_list.inc");
 echo "ok\n";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
+object(stdClass)#%d (3) {
   ["varInt"]=>
   int(1)
   ["varString"]=>
   string(4) "arg1"
   ["child"]=>
-  object(stdClass)#8 (3) {
+  object(stdClass)#%d (3) {
     ["varInt"]=>
     int(2)
     ["varString"]=>
     string(4) "arg2"
     ["child"]=>
-    object(stdClass)#9 (3) {
+    object(stdClass)#%d (3) {
       ["varInt"]=>
       int(3)
       ["varString"]=>
       string(4) "arg3"
       ["child"]=>
-      object(stdClass)#7 (3) {
-        ["varInt"]=>
-        int(1)
-        ["varString"]=>
-        string(4) "arg1"
-        ["child"]=>
-        object(stdClass)#8 (3) {
-          ["varInt"]=>
-          int(2)
-          ["varString"]=>
-          string(4) "arg2"
-          ["child"]=>
-          object(stdClass)#9 (3) {
-            ["varInt"]=>
-            int(3)
-            ["varString"]=>
-            string(4) "arg3"
-            ["child"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/branches/PHP_5_3/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -22,44 +22,30 @@
 include("round3_groupE_list.inc");
 echo "ok\n";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
+object(stdClass)#%d (3) {
   ["varInt"]=>
   int(1)
   ["varString"]=>
   string(4) "arg1"
   ["child"]=>
-  &object(stdClass)#8 (3) {
+  &object(stdClass)#%d (3) {
     ["varInt"]=>
     int(2)
     ["varString"]=>
     string(4) "arg2"
     ["child"]=>
-    object(stdClass)#9 (3) {
+    object(stdClass)#%d (3) {
       ["varInt"]=>
       int(3)
       ["varString"]=>
       string(4) "arg3"
       ["child"]=>
-      object(stdClass)#8 (3) {
-        ["varInt"]=>
-        int(2)
-        ["varString"]=>
-        string(4) "arg2"
-        ["child"]=>
-        object(stdClass)#9 (3) {
-          ["varInt"]=>
-          int(3)
-          ["varString"]=>
-          string(4) "arg3"
-          ["child"]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_var_dump.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_var_dump.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_var_dump.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -8,28 +8,16 @@

 var_dump($o);
 --EXPECTF--
-object(SplObjectStorage)#1 (1) {
+object(SplObjectStorage)#%d (1) {
   ["storage":"SplObjectStorage":private]=>
   array(1) {
     ["%s"]=>
     array(2) {
       ["obj"]=>
-      object(stdClass)#2 (0) {
+      object(stdClass)#%d (0) {
       }
       ["inf"]=>
-      object(SplObjectStorage)#1 (1) {
-        ["storage":"SplObjectStorage":private]=>
-        array(1) {
-          ["%s"]=>
-          array(2) {
-            ["obj"]=>
-            object(stdClass)#2 (0) {
-            }
-            ["inf"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/array_027.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/array_027.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/array_027.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -9,16 +9,10 @@

 var_dump($o);
 --EXPECTF--
-object(AO)#1 (1) {
+object(AO)#%d (1) {
   ["storage":"ArrayObject":private]=>
   array(1) {
     ["plop"]=>
-    object(AO)#1 (1) {
-      ["storage":"ArrayObject":private]=>
-      array(1) {
-        ["plop"]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/dllist_012.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/dllist_012.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/dllist_012.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -8,22 +8,14 @@
 var_dump($a);
 ?>
 ===DONE===
---EXPECT--
-object(SplDoublyLinkedList)#1 (2) {
+--EXPECTF--
+object(SplDoublyLinkedList)#%d (2) {
   ["flags":"SplDoublyLinkedList":private]=>
   int(0)
   ["dllist":"SplDoublyLinkedList":private]=>
   array(1) {
     [0]=>
-    object(SplDoublyLinkedList)#1 (2) {
-      ["flags":"SplDoublyLinkedList":private]=>
-      int(0)
-      ["dllist":"SplDoublyLinkedList":private]=>
-      array(1) {
-        [0]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }
 ===DONE===

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/heap_012.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/heap_012.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/heap_012.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -7,8 +7,8 @@
 var_dump($a)
 ?>
 ===DONE===
---EXPECT--
-object(SplMaxHeap)#1 (3) {
+--EXPECTF--
+object(SplMaxHeap)#%d (3) {
   ["flags":"SplHeap":private]=>
   int(0)
   ["isCorrupted":"SplHeap":private]=>
@@ -16,17 +16,7 @@
   ["heap":"SplHeap":private]=>
   array(1) {
     [0]=>
-    object(SplMaxHeap)#1 (3) {
-      ["flags":"SplHeap":private]=>
-      int(0)
-      ["isCorrupted":"SplHeap":private]=>
-      bool(false)
-      ["heap":"SplHeap":private]=>
-      array(1) {
-        [0]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }
 ===DONE===

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug28325.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug28325.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug28325.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -24,16 +24,7 @@
     ["c"]=>
     object(c)#%d (1) {
       ["d"]=>
-      object(a)#%d (1) {
-        ["b"]=>
-        object(b)#%d (1) {
-          ["c"]=>
-          object(c)#%d (1) {
-            ["d"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -34,7 +34,6 @@
 echo "\nDone";
 ?>
 --EXPECTF--
-
 --- Testing Circular reference of an array ---
 -- Normal array --
 string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}"
@@ -68,23 +67,7 @@
     array(0) {
     }
     [6]=>
-    &array(7) {
-      [0]=>
-      int(0)
-      [1]=>
-      int(1)
-      [2]=>
-      int(-2)
-      [3]=>
-      float(3.333333)
-      [4]=>
-      string(1) "a"
-      [5]=>
-      array(0) {
-      }
-      [6]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }

@@ -103,4 +86,4 @@
   &string(4) "test"
 }

-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_004.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_004.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -52,21 +52,12 @@
 echo "Done";
 ?>
 --EXPECTF--
-
-
 --- 1 refs container:
 array(3) {
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      int(1)
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
     int(1)
     [2]=>
@@ -82,14 +73,7 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      int(1)
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
     int(1)
     [2]=>
@@ -102,7 +86,7 @@
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   int(1)
   [2]=>
@@ -110,7 +94,7 @@
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   string(10) "b1.changed"
   [2]=>
@@ -118,7 +102,7 @@
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   string(10) "b1.changed"
   [2]=>
@@ -131,46 +115,18 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
@@ -182,46 +138,18 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
@@ -259,92 +187,29 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [2]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }
 string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;R:2;}i:1;R:2;i:2;R:2;}"
@@ -352,92 +217,29 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [2]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }
 array(3) {
@@ -464,4 +266,4 @@
   [2]=>
   &string(10) "b2.changed"
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_005.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_005.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_005.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -79,8 +79,6 @@

 ?>
 --EXPECTF--
-
-
 --- Nested array references 1 element in containing array:
 array(3) {
   [0]=>
@@ -443,19 +441,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        &array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }
@@ -476,19 +462,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }
@@ -508,19 +482,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }
@@ -540,19 +502,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        string(12) "b2.0.changed"
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_015.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_015.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_015.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -74,14 +74,7 @@
 --- a refs container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -90,14 +83,7 @@
 string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";i:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -132,14 +118,7 @@
 --- a eqs container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -148,14 +127,7 @@
 string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";i:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -190,46 +162,18 @@
 --- a,b ref container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
@@ -262,46 +206,18 @@
 --- a,b eq container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
@@ -309,14 +225,7 @@
   ["a"]=>
   string(14) "obj->a.changed"
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
@@ -341,62 +250,20 @@
 --- a,b,c ref container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";R:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
@@ -427,84 +294,28 @@
 --- a,b,c eq container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";r:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
   string(14) "obj->a.changed"
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
@@ -512,14 +323,7 @@
   ["b"]=>
   string(14) "obj->b.changed"
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    string(14) "obj->b.changed"
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
@@ -529,4 +333,4 @@
   ["c"]=>
   string(14) "obj->c.changed"
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/json/tests/003.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/003.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/json/tests/003.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -21,10 +21,7 @@
   [0]=>
   &array(1) {
     [0]=>
-    &array(1) {
-      [0]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }


Modified: php/php-src/trunk/ext/json/tests/004.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/004.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/json/tests/004.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -16,10 +16,7 @@
 --EXPECTF--
 object(stdClass)#%d (1) {
   ["prop"]=>
-  object(stdClass)#%d (1) {
-    ["prop"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }

 Warning: json_encode(): recursion detected in %s on line %d

Modified: php/php-src/trunk/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
===================================================================
--- php/php-src/trunk/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -22,51 +22,30 @@
 include("round3_groupE_list.inc");
 echo "ok\n";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
+object(stdClass)#%d (3) {
   ["varInt"]=>
   int(1)
   ["varString"]=>
   string(4) "arg1"
   ["child"]=>
-  object(stdClass)#8 (3) {
+  object(stdClass)#%d (3) {
     ["varInt"]=>
     int(2)
     ["varString"]=>
     string(4) "arg2"
     ["child"]=>
-    object(stdClass)#9 (3) {
+    object(stdClass)#%d (3) {
       ["varInt"]=>
       int(3)
       ["varString"]=>
       string(4) "arg3"
       ["child"]=>
-      object(stdClass)#7 (3) {
-        ["varInt"]=>
-        int(1)
-        ["varString"]=>
-        string(4) "arg1"
-        ["child"]=>
-        object(stdClass)#8 (3) {
-          ["varInt"]=>
-          int(2)
-          ["varString"]=>
-          string(4) "arg2"
-          ["child"]=>
-          object(stdClass)#9 (3) {
-            ["varInt"]=>
-            int(3)
-            ["varString"]=>
-            string(4) "arg3"
-            ["child"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/trunk/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
===================================================================
--- php/php-src/trunk/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -22,44 +22,30 @@
 include("round3_groupE_list.inc");
 echo "ok\n";
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-object(stdClass)#7 (3) {
+object(stdClass)#%d (3) {
   ["varInt"]=>
   int(1)
   ["varString"]=>
   string(4) "arg1"
   ["child"]=>
-  &object(stdClass)#8 (3) {
+  &object(stdClass)#%d (3) {
     ["varInt"]=>
     int(2)
     ["varString"]=>
     string(4) "arg2"
     ["child"]=>
-    object(stdClass)#9 (3) {
+    object(stdClass)#%d (3) {
       ["varInt"]=>
       int(3)
       ["varString"]=>
       string(4) "arg3"
       ["child"]=>
-      object(stdClass)#8 (3) {
-        ["varInt"]=>
-        int(2)
-        ["varString"]=>
-        string(4) "arg2"
-        ["child"]=>
-        object(stdClass)#9 (3) {
-          ["varInt"]=>
-          int(3)
-          ["varString"]=>
-          string(4) "arg3"
-          ["child"]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/trunk/ext/spl/tests/SplObjectStorage_var_dump.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplObjectStorage_var_dump.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/spl/tests/SplObjectStorage_var_dump.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -8,28 +8,16 @@

 var_dump($o);
 --EXPECTF--
-object(SplObjectStorage)#1 (1) {
+object(SplObjectStorage)#%d (1) {
   ["storage":"SplObjectStorage":private]=>
   array(1) {
     ["%s"]=>
     array(2) {
       ["obj"]=>
-      object(stdClass)#2 (0) {
+      object(stdClass)#%d (0) {
       }
       ["inf"]=>
-      object(SplObjectStorage)#1 (1) {
-        ["storage":"SplObjectStorage":private]=>
-        array(1) {
-          ["%s"]=>
-          array(2) {
-            ["obj"]=>
-            object(stdClass)#2 (0) {
-            }
-            ["inf"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/trunk/ext/spl/tests/array_027.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/array_027.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/spl/tests/array_027.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -9,16 +9,10 @@

 var_dump($o);
 --EXPECTF--
-object(AO)#1 (1) {
+object(AO)#%d (1) {
   ["storage":"ArrayObject":private]=>
   array(1) {
     ["plop"]=>
-    object(AO)#1 (1) {
-      ["storage":"ArrayObject":private]=>
-      array(1) {
-        ["plop"]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }

Modified: php/php-src/trunk/ext/spl/tests/dllist_012.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/dllist_012.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/spl/tests/dllist_012.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -8,22 +8,14 @@
 var_dump($a);
 ?>
 ===DONE===
---EXPECT--
-object(SplDoublyLinkedList)#1 (2) {
+--EXPECTF--
+object(SplDoublyLinkedList)#%d (2) {
   ["flags":"SplDoublyLinkedList":private]=>
   int(0)
   ["dllist":"SplDoublyLinkedList":private]=>
   array(1) {
     [0]=>
-    object(SplDoublyLinkedList)#1 (2) {
-      ["flags":"SplDoublyLinkedList":private]=>
-      int(0)
-      ["dllist":"SplDoublyLinkedList":private]=>
-      array(1) {
-        [0]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }
 ===DONE===

Modified: php/php-src/trunk/ext/spl/tests/heap_012.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/heap_012.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/spl/tests/heap_012.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -7,8 +7,8 @@
 var_dump($a)
 ?>
 ===DONE===
---EXPECT--
-object(SplMaxHeap)#1 (3) {
+--EXPECTF--
+object(SplMaxHeap)#%d (3) {
   ["flags":"SplHeap":private]=>
   int(0)
   ["isCorrupted":"SplHeap":private]=>
@@ -16,17 +16,7 @@
   ["heap":"SplHeap":private]=>
   array(1) {
     [0]=>
-    object(SplMaxHeap)#1 (3) {
-      ["flags":"SplHeap":private]=>
-      int(0)
-      ["isCorrupted":"SplHeap":private]=>
-      bool(false)
-      ["heap":"SplHeap":private]=>
-      array(1) {
-        [0]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }
 ===DONE===

Modified: php/php-src/trunk/ext/standard/tests/serialize/bug28325.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/bug28325.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/standard/tests/serialize/bug28325.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -24,16 +24,7 @@
     ["c"]=>
     object(c)#%d (1) {
       ["d"]=>
-      object(a)#%d (1) {
-        ["b"]=>
-        object(b)#%d (1) {
-          ["c"]=>
-          object(c)#%d (1) {
-            ["d"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_001.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_001.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_001.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -34,7 +34,6 @@
 echo "\nDone";
 ?>
 --EXPECTF--
-
 --- Testing Circular reference of an array ---
 -- Normal array --
 string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}"
@@ -68,23 +67,7 @@
     array(0) {
     }
     [6]=>
-    &array(7) {
-      [0]=>
-      int(0)
-      [1]=>
-      int(1)
-      [2]=>
-      int(-2)
-      [3]=>
-      float(3.333333)
-      [4]=>
-      string(1) "a"
-      [5]=>
-      array(0) {
-      }
-      [6]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }

@@ -103,4 +86,4 @@
   &string(4) "test"
 }

-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_004.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_004.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_004.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -52,21 +52,12 @@
 echo "Done";
 ?>
 --EXPECTF--
-
-
 --- 1 refs container:
 array(3) {
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      int(1)
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
     int(1)
     [2]=>
@@ -82,14 +73,7 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      int(1)
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
     int(1)
     [2]=>
@@ -102,7 +86,7 @@
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   int(1)
   [2]=>
@@ -110,7 +94,7 @@
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   string(10) "b1.changed"
   [2]=>
@@ -118,7 +102,7 @@
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   string(10) "b1.changed"
   [2]=>
@@ -131,46 +115,18 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
@@ -182,46 +138,18 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      int(1)
-    }
+    *RECURSION*
     [2]=>
     int(1)
   }
@@ -259,92 +187,29 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [2]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }
 string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;R:2;}i:1;R:2;i:2;R:2;}"
@@ -352,92 +217,29 @@
   [0]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [1]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [2]=>
   &array(3) {
     [0]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [1]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
     [2]=>
-    &array(3) {
-      [0]=>
-      *RECURSION*
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }
 array(3) {
@@ -464,4 +266,4 @@
   [2]=>
   &string(10) "b2.changed"
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_005.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_005.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/standard/tests/serialize/serialization_arrays_005.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -79,8 +79,6 @@

 ?>
 --EXPECTF--
-
-
 --- Nested array references 1 element in containing array:
 array(3) {
   [0]=>
@@ -443,19 +441,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        &array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }
@@ -476,19 +462,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }
@@ -508,19 +482,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }
@@ -540,19 +502,7 @@
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        string(12) "b2.0.changed"
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }

Modified: php/php-src/trunk/ext/standard/tests/serialize/serialization_objects_015.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/serialization_objects_015.phpt	2010-04-03 15:40:10 UTC (rev 297416)
+++ php/php-src/trunk/ext/standard/tests/serialize/serialization_objects_015.phpt	2010-04-03 15:42:42 UTC (rev 297417)
@@ -74,14 +74,7 @@
 --- a refs container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -90,14 +83,7 @@
 string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";i:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -132,14 +118,7 @@
 --- a eqs container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -148,14 +127,7 @@
 string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";i:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
   int(1)
   ["c"]=>
@@ -190,46 +162,18 @@
 --- a,b ref container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
@@ -262,46 +206,18 @@
 --- a,b eq container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";i:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
@@ -309,14 +225,7 @@
   ["a"]=>
   string(14) "obj->a.changed"
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    int(1)
-  }
+  *RECURSION*
   ["c"]=>
   int(1)
 }
@@ -341,62 +250,20 @@
 --- a,b,c ref container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";R:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  &object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
@@ -427,84 +294,28 @@
 --- a,b,c eq container:
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";r:1;}"
 object(stdClass)#%d (3) {
   ["a"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
   string(14) "obj->a.changed"
   ["b"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    *RECURSION*
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
@@ -512,14 +323,7 @@
   ["b"]=>
   string(14) "obj->b.changed"
   ["c"]=>
-  object(stdClass)#%d (3) {
-    ["a"]=>
-    string(14) "obj->a.changed"
-    ["b"]=>
-    string(14) "obj->b.changed"
-    ["c"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 object(stdClass)#%d (3) {
   ["a"]=>
@@ -529,4 +333,4 @@
   ["c"]=>
   string(14) "obj->c.changed"
 }
-Done
\ No newline at end of file
+Done