- Fixed tests

diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index f10baa9d12ae41082d57cc0c69405d7258793611..3b52fb0884172734a9f909905aebdb64c8cea9e6 100644 (file)
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -21,10 +21,7 @@ array(1) {
   [0]=>
   &array(1) {
     [0]=>
-    &array(1) {
-      [0]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
 }
 

diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 884d874205473549c158158bc40713a96cda6cda..1d282f9a961151e3457a09c2a306c208f18719db 100644 (file)
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -16,10 +16,7 @@ echo "Done\n";
 --EXPECTF--    
 object(stdClass)#%d (1) {
   ["prop"]=>
-  object(stdClass)#%d (1) {
-    ["prop"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 
 Warning: json_encode(): recursion detected in %s on line %d

diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
index 8e7876feff687f80e87cdc90bb79781964dfa194..8d149a304822125e2730af20df740ee33ddba61f 100644 (file)
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
@@ -22,51 +22,30 @@ $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 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*
     }
   }
 }

diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
index 6932d5cf99bf163fc5ecec97828906544e988534..3549f45234f49fa68d2419f4e75750f87d72d280 100644 (file)
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
@@ -22,44 +22,30 @@ $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 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*
     }
   }
 }

diff --git a/ext/spl/tests/SplObjectStorage_var_dump.phpt b/ext/spl/tests/SplObjectStorage_var_dump.phpt
index c1c7158ec55084372ffc15a5514ef824d38aa1fe..0439f465c96732f958cfa9b1323a8a09e922289f 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_var_dump.phpt
+++ b/ext/spl/tests/SplObjectStorage_var_dump.phpt
@@ -8,28 +8,16 @@ $o[new StdClass] = $o;
 
 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*
     }
   }
 }

diff --git a/ext/spl/tests/array_027.phpt b/ext/spl/tests/array_027.phpt
index 791e76322e33b5e2f3da7e05cbc0c6e455946044..509b8f9ffda46aa0b21ffa7927589c0a8808ea20 100644 (file)
--- a/ext/spl/tests/array_027.phpt
+++ b/ext/spl/tests/array_027.phpt
@@ -9,16 +9,10 @@ $o['plop'] = $o;
 
 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*
   }
 }

diff --git a/ext/spl/tests/dllist_012.phpt b/ext/spl/tests/dllist_012.phpt
index 75783fc8c47cb6a04b535331efc08df72f1db0e6..4eec9bda3ba609bffaff9e941742bccf00ee5c4a 100644 (file)
--- a/ext/spl/tests/dllist_012.phpt
+++ b/ext/spl/tests/dllist_012.phpt
@@ -8,22 +8,14 @@ $a[] = $a;
 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===

diff --git a/ext/spl/tests/heap_012.phpt b/ext/spl/tests/heap_012.phpt
index bf00f50cc72152e8fe9c0d8606507eae2f9138de..f86f14f4d093c1adebc8387641ff0ca872381e4e 100644 (file)
--- a/ext/spl/tests/heap_012.phpt
+++ b/ext/spl/tests/heap_012.phpt
@@ -7,8 +7,8 @@ $a->insert($a);
 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 @@ object(SplMaxHeap)#1 (3) {
   ["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===

diff --git a/ext/standard/tests/serialize/bug28325.phpt b/ext/standard/tests/serialize/bug28325.phpt
index 7f2bd66371128c96d36fba073dc7f115ec9aa170..ee0e60e1ad1a28d0d40d5371ad55766e2bd44a5d 100644 (file)
--- a/ext/standard/tests/serialize/bug28325.phpt
+++ b/ext/standard/tests/serialize/bug28325.phpt
@@ -24,16 +24,7 @@ object(a)#%d (1) {
     ["c"]=>
     object(c)#%d (1) {
       ["d"]=>
-      object(a)#%d (1) {
-        ["b"]=>
-        object(b)#%d (1) {
-          ["c"]=>
-          object(c)#%d (1) {
-            ["d"]=>
-            *RECURSION*
-          }
-        }
-      }
+      *RECURSION*
     }
   }
 }

diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt
index f62f69855423c6db023411c70b7826700a69a32c..ff5f34c5b4c6bb7eb7bf84780ad2471c49ff06bf 100644 (file)
--- a/ext/standard/tests/serialize/serialization_arrays_001.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt
@@ -34,7 +34,6 @@ var_dump($arr_asso);
 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(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 @@ array(2) {
   &string(4) "test"
 }
 
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt
index 942afdfb939097f79ac204766290eaaff271edf2..55d849c972c66805634cc777501a09cba995bce9 100644 (file)
--- a/ext/standard/tests/serialize/serialization_arrays_004.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt
@@ -52,21 +52,12 @@ check($a);
 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 @@ array(3) {
   [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) {
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   int(1)
   [2]=>
@@ -110,7 +94,7 @@ array(3) {
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   string(10) "b1.changed"
   [2]=>
@@ -118,7 +102,7 @@ array(3) {
 }
 array(3) {
   [0]=>
-  %string(10) "b0.changed"
+  string(10) "b0.changed"
   [1]=>
   string(10) "b1.changed"
   [2]=>
@@ -131,46 +115,18 @@ array(3) {
   [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 @@ array(3) {
   [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 @@ array(3) {
   [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 @@ array(3) {
   [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 @@ array(3) {
   [2]=>
   &string(10) "b2.changed"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt
index dd3e436edd67743debc15b85e8f38c1255ec6b71..10e33129f848b5b68f58e7a4b379c17a919dd2a2 100644 (file)
--- a/ext/standard/tests/serialize/serialization_arrays_005.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt
@@ -79,8 +79,6 @@ check($c);
 
 ?>
 --EXPECTF--
-
-
 --- Nested array references 1 element in containing array:
 array(3) {
   [0]=>
@@ -443,19 +441,7 @@ array(3) {
       [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 @@ array(3) {
       [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 @@ array(3) {
       [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 @@ array(3) {
       [1]=>
       int(1)
       [2]=>
-      &array(2) {
-        [0]=>
-        string(12) "b2.0.changed"
-        [1]=>
-        array(3) {
-          [0]=>
-          int(1)
-          [1]=>
-          int(1)
-          [2]=>
-          *RECURSION*
-        }
-      }
+      *RECURSION*
     }
   }
 }

diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt
index 02e8279c4d753a4173d769381165c292320f721a..2265caba93f1a33147b3182572e4e4427bed1720 100644 (file)
--- a/ext/standard/tests/serialize/serialization_objects_015.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_015.phpt
@@ -74,14 +74,7 @@ echo "Done";
 --- 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 @@ object(stdClass)#%d (3) {
 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 @@ object(stdClass)#%d (3) {
 --- 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 @@ object(stdClass)#%d (3) {
 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 @@ object(stdClass)#%d (3) {
 --- 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 @@ object(stdClass)#%d (3) {
 --- 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 @@ object(stdClass)#%d (3) {
   ["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 @@ object(stdClass)#%d (3) {
 --- 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 @@ object(stdClass)#%d (3) {
 --- 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 @@ object(stdClass)#%d (3) {
   ["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 @@ object(stdClass)#%d (3) {
   ["c"]=>
   string(14) "obj->c.changed"
 }
-Done
\ No newline at end of file
+Done