Modified: php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -21,10 +21,7 @@ [0]=> &array(1) { [0]=> - &array(1) { - [0]=> - *RECURSION* - } + *RECURSION* } } Modified: php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -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_2/ext/standard/tests/serialize/bug28325.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/bug28325.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/bug28325.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -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_2/ext/standard/tests/serialize/serialization_arrays_001.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_001.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_001.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -36,7 +36,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;}}" @@ -70,23 +69,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* } } Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -59,21 +59,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]=> @@ -89,14 +80,7 @@ [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - int(1) - [2]=> - int(1) - } + *RECURSION* [1]=> int(1) [2]=> @@ -109,7 +93,7 @@ } array(3) { [0]=> - %string(10) "b0.changed" + string(10) "b0.changed" [1]=> int(1) [2]=> @@ -117,7 +101,7 @@ } array(3) { [0]=> - %string(10) "b0.changed" + string(10) "b0.changed" [1]=> string(10) "b1.changed" [2]=> @@ -125,7 +109,7 @@ } array(3) { [0]=> - %string(10) "b0.changed" + string(10) "b0.changed" [1]=> string(10) "b1.changed" [2]=> @@ -138,46 +122,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) } @@ -189,46 +145,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) } @@ -266,92 +194,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;}" @@ -359,92 +224,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) { Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_005.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_005.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_005.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -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_2/ext/standard/tests/serialize/serialization_objects_015.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_objects_015.phpt 2010-04-03 16:20:24 UTC (rev 297425) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_objects_015.phpt 2010-04-03 16:21:15 UTC (rev 297426) @@ -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) } @@ -339,64 +248,22 @@ --- a,b,c ref container: -object(stdClass)#%d (3) { +object(stdClass)#1 (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