cvs: php-src /ext/standard/tests/serialize 001.phpt 002.phpt 005.phpt 006.phpt autoload_implements.p5c autoload_interface.p5c bug14293.phpt
bug21957.phpt bug26762.phpt bug27469.phpt bug28325.phpt bug31402.phpt serialization_arrays_001.phpt serialization_arrays_002.phpt
serialization_arrays_003.phpt serialization_arrays_004.phpt serialization_arrays_005.phpt serialization_error_001.phpt
serialization_miscTypes_001.phpt serialization_objects_001.phpt serialization_objects_002.phpt serialization_objects_003.phpt
serialization_objects_004.phpt serialization_objects_005.phpt serialization_objects_006.phpt serialization_objects_007.phpt
serialization_objects_008.phpt serialization_objects_009.phpt serialization_objects_010.phpt serialization_objects_011.phpt
serialization_objects_012.phpt serialization_objects_013.phpt serialization_objects_014.phpt serialization_objects_015.phpt
serialization_precision_001.phpt serialization_precision_002.phpt serialization_resources_001! .phpt

sfox Tue May 27 07:45:41 2008 UTC Modified files: /php-src/ext/standard/tests/serialize 001.phpt 002.phpt 005.phpt 006.phpt autoload_implements.p5c autoload_interface.p5c bug14293.phpt bug21957.phpt bug26762.phpt bug27469.phpt bug28325.phpt bug31402.phpt serialization_arrays_001.phpt serialization_arrays_002.phpt serialization_arrays_003.phpt serialization_arrays_004.phpt serialization_arrays_005.phpt serialization_error_001.phpt serialization_miscTypes_001.phpt serialization_objects_001.phpt serialization_objects_002.phpt serialization_objects_003.phpt serialization_objects_004.phpt serialization_objects_005.phpt serialization_objects_006.phpt serialization_objects_007.phpt serialization_objects_008.phpt serialization_objects_009.phpt serialization_objects_010.phpt serialization_objects_011.phpt serialization_objects_012.phpt serialization_objects_013.phpt serialization_objects_014.phpt serialization_objects_015.phpt serialization_precision_001.phpt serialization_precision_002.phpt serialization_resources_001.phpt Log: - killed off UEXPECT

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/001.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/standard/tests/serialize/001.phpt diff -u php-src/ext/standard/tests/serialize/001.phpt:1.9 php-src/ext/standard/tests/serialize/001.phpt:1.10 --- php-src/ext/standard/tests/serialize/001.phpt:1.9 Tue Dec 19 12:45:03 2006 +++ php-src/ext/standard/tests/serialize/001.phpt Tue May 27 07:45:40 2008 @@ -87,51 +87,6 @@ d:0; d:-1; d:-1.123456789000000011213842299184761941432952880859375; -S:5:"hallo"; -a:6:{i:0;i:1;i:1;d:1.100000000000000088817841970012523233890533447265625;i:2;S:5:"hallo";i:3;N;i:4;b:1;i:5;a:0:{}} -O:1:"t":1:{S:1:"a";S:5:"hallo";} -object(t)#%d (1) { - ["a"]=> - string(5) "hallo" -} -__sleep called -O:1:"s":2:{S:1:"a";S:5:"hallo";S:1:"c";S:5:"world";} -__wakeup called -object(s)#%d (3) { - ["a"]=> - string(5) "hallo" - ["b"]=> - NULL - ["c"]=> - string(5) "world" -} -array(2) { - ["a"]=> - &string(4) "test" - ["b"]=> - &string(4) "test" -} -a:2:{S:1:"a";S:4:"test";S:1:"b";R:2;} -array(2) { - ["a"]=> - &string(4) "test" - ["b"]=> - &string(4) "test" -} ---UEXPECTF-- -N; -b:1; -b:0; -i:1; -i:0; -i:-1; -i:2147483647; -i:-2147483647; -d:1.123456789000000011213842299184761941432952880859375; -d:1; -d:0; -d:-1; -d:-1.123456789000000011213842299184761941432952880859375; U:5:"hallo"; a:6:{i:0;i:1;i:1;d:1.100000000000000088817841970012523233890533447265625;i:2;U:5:"hallo";i:3;N;i:4;b:1;i:5;a:0:{}} O:1:"t":1:{U:1:"a";U:5:"hallo";} http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/002.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/serialize/002.phpt diff -u php-src/ext/standard/tests/serialize/002.phpt:1.6 php-src/ext/standard/tests/serialize/002.phpt:1.7 --- php-src/ext/standard/tests/serialize/002.phpt:1.6 Wed Dec 6 13:21:48 2006 +++ php-src/ext/standard/tests/serialize/002.phpt Tue May 27 07:45:40 2008 @@ -42,32 +42,3 @@ object(stdClass)#%d (0) { } ===DONE=== ---UEXPECTF-- -bool(false) -bool(true) -int(823) -string(0) "" -string(3) "foo" -array(1) { - [0]=> - string(2) "12" -} -array(2) { - [0]=> - array(0) { - } - [1]=> - array(0) { - } -} -array(3) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" - [2]=> - string(3) "baz" -} -object(stdClass)#%d (0) { -} -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/005.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/serialize/005.phpt diff -u php-src/ext/standard/tests/serialize/005.phpt:1.6 php-src/ext/standard/tests/serialize/005.phpt:1.7 --- php-src/ext/standard/tests/serialize/005.phpt:1.6 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/005.phpt Tue May 27 07:45:40 2008 @@ -135,58 +135,6 @@ --EXPECTF-- ===O1=== TestOld::__sleep() -string(18) "O:7:"TestOld":0:{}" -TestOld::__wakeup() -object(TestOld)#%d (0) { -} -===N1=== -TestNew::serialize() -string(2) "N;" -NULL -===N2=== -TestNew::serialize() -string(19) "C:7:"TestNew":1:{2}" -TestNew::unserialize() -object(TestNew)#%d (0) { -} -===NAOld=== -unserializer(TestNAOld) -TestOld::__wakeup() -object(TestNAOld)#%d (0) { -} -===NANew=== -unserializer(TestNANew) -TestNew::__wakeup() -object(TestNANew)#%d (0) { -} -===NANew2=== -unserializer(TestNANew2) -TestNew::unserialize() -object(TestNANew2)#%d (0) { -} -===AutoOld=== -unserializer(autoload_implements) -Try __autoload() -do_autoload(autoload_interface) -do_autoload(autoload_implements) -object(autoload_implements)#%d (0) { -} -===AutoNA=== -do_autoload(autoload_not_available) -unserializer(autoload_not_available) -Try __autoload() -do_autoload(autoload_not_available) -do_autoload(autoload_not_available) - -Warning: unserialize(): Function unserializer() hasn't defined the class it was called for in %s005.php on line %d -object(__PHP_Incomplete_Class)#%d (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(22) "autoload_not_available" -} -===DONE=== ---UEXPECTF-- -===O1=== -TestOld::__sleep() unicode(18) "O:7:"TestOld":0:{}" TestOld::__wakeup() object(TestOld)#%d (0) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/006.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/serialize/006.phpt diff -u php-src/ext/standard/tests/serialize/006.phpt:1.5 php-src/ext/standard/tests/serialize/006.phpt:1.6 --- php-src/ext/standard/tests/serialize/006.phpt:1.5 Fri Dec 22 00:37:20 2006 +++ php-src/ext/standard/tests/serialize/006.phpt Tue May 27 07:45:40 2008 @@ -20,17 +20,6 @@ var_dump(unserialize(serialize($åäöÅÄÖ))); ?> --EXPECT-- -string(83) "O:11:"ÜberKööliäå":1:{S:11:"\e5\e4\f6\c5\c4\d6\fc\dcber";S:6:"\e5\e4\f6\c5\c4\d6";}" -object(ÜberKööliäå)#2 (1) { - ["åäöÅÄÖüÜber"]=> - string(6) "åäöÅÄÖ" -} -string(56) "a:1:{S:6:"\e5\e4\f6\c5\c4\d6";S:6:"\e5\e4\f6\c5\c4\d6";}" -array(1) { - ["åäöÅÄÖ"]=> - string(6) "åäöÅÄÖ" -} ---UEXPECT-- unicode(131) "O:11:"\00dcberK\00f6\00f6li\00e4\00e5":1:{U:11:"\00e5\00e4\00f6\00c5\00c4\00d6\00fc\00dcber";U:6:"\00e5\00e4\00f6\00c5\00c4\00d6";}" object(ÜberKööliäå)#2 (1) { [u"åäöÅÄÖüÜber"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/autoload_implements.p5c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/serialize/autoload_implements.p5c diff -u php-src/ext/standard/tests/serialize/autoload_implements.p5c:1.1 php-src/ext/standard/tests/serialize/autoload_implements.p5c:1.2 --- php-src/ext/standard/tests/serialize/autoload_implements.p5c:1.1 Sun Sep 26 18:28:07 2004 +++ php-src/ext/standard/tests/serialize/autoload_implements.p5c Tue May 27 07:45:40 2008 @@ -1,10 +1,10 @@ -<?php - -class autoload_implements implements autoload_interface { - function testFunction() - { - return true; - } -} - +<?php + +class autoload_implements implements autoload_interface { + function testFunction() + { + return true; + } +} + ?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/autoload_interface.p5c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/serialize/autoload_interface.p5c diff -u php-src/ext/standard/tests/serialize/autoload_interface.p5c:1.1 php-src/ext/standard/tests/serialize/autoload_interface.p5c:1.2 --- php-src/ext/standard/tests/serialize/autoload_interface.p5c:1.1 Sun Sep 26 18:28:07 2004 +++ php-src/ext/standard/tests/serialize/autoload_interface.p5c Tue May 27 07:45:40 2008 @@ -1,7 +1,7 @@ -<?php - -interface autoload_interface { - function testFunction(); -} - +<?php + +interface autoload_interface { + function testFunction(); +} + ?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug14293.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/serialize/bug14293.phpt diff -u php-src/ext/standard/tests/serialize/bug14293.phpt:1.5 php-src/ext/standard/tests/serialize/bug14293.phpt:1.6 --- php-src/ext/standard/tests/serialize/bug14293.phpt:1.5 Tue Dec 19 12:45:03 2006 +++ php-src/ext/standard/tests/serialize/bug14293.phpt Tue May 27 07:45:40 2008 @@ -27,17 +27,6 @@ __sleep called Notice: serialize(): "b" returned as member variable from __sleep() but does not exist in %sbug14293.php on line %d -O:1:"t":2:{S:1:"a";S:5:"hello";S:1:"b";N;} -object(t)#%d (2) { - ["a"]=> - string(5) "hello" - ["b"]=> - NULL -} ---UEXPECTF-- -__sleep called - -Notice: serialize(): "b" returned as member variable from __sleep() but does not exist in %sbug14293.php on line %d O:1:"t":2:{U:1:"a";U:5:"hello";U:1:"b";N;} object(t)#%d (2) { [u"a"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug21957.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/serialize/bug21957.phpt diff -u php-src/ext/standard/tests/serialize/bug21957.phpt:1.4 php-src/ext/standard/tests/serialize/bug21957.phpt:1.5 --- php-src/ext/standard/tests/serialize/bug21957.phpt:1.4 Tue Dec 19 12:45:03 2006 +++ php-src/ext/standard/tests/serialize/bug21957.phpt Tue May 27 07:45:40 2008 @@ -30,25 +30,6 @@ ?> --EXPECT-- array(2) { - ["one"]=> - string(3) "ABC" - ["two"]=> - object(test)#1 (2) { - ["a"]=> - int(7) - ["b"]=> - int(2) - } -} -a:2:{S:3:"one";S:3:"ABC";S:3:"two";N;} -array(2) { - ["one"]=> - string(3) "ABC" - ["two"]=> - NULL -} ---UEXPECT-- -array(2) { [u"one"]=> unicode(3) "ABC" [u"two"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug26762.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/bug26762.phpt diff -u php-src/ext/standard/tests/serialize/bug26762.phpt:1.2 php-src/ext/standard/tests/serialize/bug26762.phpt:1.3 --- php-src/ext/standard/tests/serialize/bug26762.phpt:1.2 Mon Mar 27 13:37:47 2006 +++ php-src/ext/standard/tests/serialize/bug26762.phpt Tue May 27 07:45:40 2008 @@ -24,6 +24,4 @@ ?> --EXPECTF-- -string(3) "FOO" ---UEXPECTF-- unicode(3) "FOO" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug27469.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/bug27469.phpt diff -u php-src/ext/standard/tests/serialize/bug27469.phpt:1.2 php-src/ext/standard/tests/serialize/bug27469.phpt:1.3 --- php-src/ext/standard/tests/serialize/bug27469.phpt:1.2 Mon Mar 27 13:37:47 2006 +++ php-src/ext/standard/tests/serialize/bug27469.phpt Tue May 27 07:45:40 2008 @@ -12,21 +12,6 @@ ?> --EXPECT-- object(__PHP_Incomplete_Class)#1 (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(9) "TestClass" -} -O:9:"TestClass":0:{} -object(__PHP_Incomplete_Class)#1 (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(9) "TestClass" -} -O:9:"TestClass":0:{} -object(__PHP_Incomplete_Class)#1 (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(9) "TestClass" -} ---UEXPECT-- -object(__PHP_Incomplete_Class)#1 (1) { [u"__PHP_Incomplete_Class_Name"]=> unicode(9) "TestClass" } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug28325.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/bug28325.phpt diff -u php-src/ext/standard/tests/serialize/bug28325.phpt:1.2 php-src/ext/standard/tests/serialize/bug28325.phpt:1.3 --- php-src/ext/standard/tests/serialize/bug28325.phpt:1.2 Mon Mar 27 13:37:47 2006 +++ php-src/ext/standard/tests/serialize/bug28325.phpt Tue May 27 07:45:40 2008 @@ -19,26 +19,6 @@ ?> --EXPECTF-- object(a)#%d (1) { - ["b"]=> - object(b)#%d (1) { - ["c"]=> - object(c)#%d (1) { - ["d"]=> - object(a)#%d (1) { - ["b"]=> - object(b)#%d (1) { - ["c"]=> - object(c)#%d (1) { - ["d"]=> - *RECURSION* - } - } - } - } - } -} ---UEXPECTF-- -object(a)#%d (1) { [u"b"]=> object(b)#%d (1) { [u"c"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug31402.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/serialize/bug31402.phpt diff -u php-src/ext/standard/tests/serialize/bug31402.phpt:1.5 php-src/ext/standard/tests/serialize/bug31402.phpt:1.6 --- php-src/ext/standard/tests/serialize/bug31402.phpt:1.5 Sat Feb 23 17:03:53 2008 +++ php-src/ext/standard/tests/serialize/bug31402.phpt Tue May 27 07:45:40 2008 @@ -35,58 +35,6 @@ ===DONE=== --EXPECTF-- object(TestY)#%d (2) { - ["A"]=> - array(3) { - [1]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } - [2]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - [3]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - } - ["B"]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } -} -object(TestY)#%d (2) { - ["A"]=> - array(3) { - [1]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } - [2]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - [3]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - } - ["B"]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } -} -===DONE=== ---UEXPECTF-- -object(TestY)#%d (2) { [u"A"]=> array(3) { [1]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_arrays_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_arrays_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_arrays_001.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_arrays_001.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_arrays_001.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_arrays_001.phpt Tue May 27 07:45:40 2008 @@ -33,78 +33,7 @@ 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;}}" -array(7) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(-2) - [3]=> - float(3.333333) - [4]=> - string(1) "a" - [5]=> - 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]=> - &array(7) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(-2) - [3]=> - float(3.333333) - [4]=> - string(1) "a" - [5]=> - array(0) { - } - [6]=> - *RECURSION* - } - } -} - --- Associative array -- -array(2) { - ["a"]=> - &string(4) "test" - ["b"]=> - &string(4) "test" -} -string(37) "a:2:{S:1:"a";S:4:"test";S:1:"b";R:2;}" -array(2) { - ["a"]=> - &string(4) "test" - ["b"]=> - &string(4) "test" -} - -Done ---UEXPECTF-- +--EXPECT-- --- Testing Circular reference of an array --- -- Normal array -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_arrays_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_arrays_002.phpt diff -u php-src/ext/standard/tests/serialize/serialization_arrays_002.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_arrays_002.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_arrays_002.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_arrays_002.phpt Tue May 27 07:45:40 2008 @@ -100,449 +100,7 @@ echo "Done"; ?> ---EXPECTF-- - - ---- No references: -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) -} -string(30) "a:3:{i:0;i:1;i:1;i:1;i:2;i:1;}" -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 0 refs 1: -array(3) { - [1]=> - &int(1) - [0]=> - &int(1) - [2]=> - int(1) -} -string(30) "a:3:{i:1;i:1;i:0;R:2;i:2;i:1;}" -array(3) { - [1]=> - &int(1) - [0]=> - &int(1) - [2]=> - int(1) -} -array(3) { - [1]=> - &string(10) "b0.changed" - [0]=> - &string(10) "b0.changed" - [2]=> - int(1) -} -array(3) { - [1]=> - &string(10) "b1.changed" - [0]=> - &string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [1]=> - &string(10) "b1.changed" - [0]=> - &string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 0 refs 2: -array(3) { - [2]=> - &int(1) - [0]=> - &int(1) - [1]=> - int(1) -} -string(30) "a:3:{i:2;i:1;i:0;R:2;i:1;i:1;}" -array(3) { - [2]=> - &int(1) - [0]=> - &int(1) - [1]=> - int(1) -} -array(3) { - [2]=> - &string(10) "b0.changed" - [0]=> - &string(10) "b0.changed" - [1]=> - int(1) -} -array(3) { - [2]=> - &string(10) "b0.changed" - [0]=> - &string(10) "b0.changed" - [1]=> - string(10) "b1.changed" -} -array(3) { - [2]=> - &string(10) "b2.changed" - [0]=> - &string(10) "b2.changed" - [1]=> - string(10) "b1.changed" -} - - ---- 1 refs 0: -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - int(1) -} -string(30) "a:3:{i:0;i:1;i:1;R:2;i:2;i:1;}" -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 1 refs 2: -array(3) { - [0]=> - int(1) - [2]=> - &int(1) - [1]=> - &int(1) -} -string(30) "a:3:{i:0;i:1;i:2;i:1;i:1;R:3;}" -array(3) { - [0]=> - int(1) - [2]=> - &int(1) - [1]=> - &int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [2]=> - &int(1) - [1]=> - &int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [2]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" -} -array(3) { - [0]=> - string(10) "b0.changed" - [2]=> - &string(10) "b2.changed" - [1]=> - &string(10) "b2.changed" -} - - ---- 2 refs 0: -array(3) { - [0]=> - &int(1) - [1]=> - int(1) - [2]=> - &int(1) -} -string(30) "a:3:{i:0;i:1;i:1;i:1;i:2;R:2;}" -array(3) { - [0]=> - &int(1) - [1]=> - int(1) - [2]=> - &int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - int(1) - [2]=> - &string(10) "b0.changed" -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - &string(10) "b0.changed" -} -array(3) { - [0]=> - &string(10) "b2.changed" - [1]=> - string(10) "b1.changed" - [2]=> - &string(10) "b2.changed" -} - - ---- 2 refs 1: -array(3) { - [0]=> - int(1) - [1]=> - &int(1) - [2]=> - &int(1) -} -string(30) "a:3:{i:0;i:1;i:1;i:1;i:2;R:3;}" -array(3) { - [0]=> - int(1) - [1]=> - &int(1) - [2]=> - &int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &int(1) - [2]=> - &int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - &string(10) "b1.changed" -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &string(10) "b2.changed" - [2]=> - &string(10) "b2.changed" -} - - ---- 0,1 ref 2: -array(3) { - [2]=> - &int(1) - [0]=> - &int(1) - [1]=> - &int(1) -} -string(30) "a:3:{i:2;i:1;i:0;R:2;i:1;R:2;}" -array(3) { - [2]=> - &int(1) - [0]=> - &int(1) - [1]=> - &int(1) -} -array(3) { - [2]=> - &string(10) "b0.changed" - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" -} -array(3) { - [2]=> - &string(10) "b1.changed" - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" -} -array(3) { - [2]=> - &string(10) "b2.changed" - [0]=> - &string(10) "b2.changed" - [1]=> - &string(10) "b2.changed" -} - - ---- 0,2 ref 1: -array(3) { - [1]=> - &int(1) - [0]=> - &int(1) - [2]=> - &int(1) -} -string(30) "a:3:{i:1;i:1;i:0;R:2;i:2;R:2;}" -array(3) { - [1]=> - &int(1) - [0]=> - &int(1) - [2]=> - &int(1) -} -array(3) { - [1]=> - &string(10) "b0.changed" - [0]=> - &string(10) "b0.changed" - [2]=> - &string(10) "b0.changed" -} -array(3) { - [1]=> - &string(10) "b1.changed" - [0]=> - &string(10) "b1.changed" - [2]=> - &string(10) "b1.changed" -} -array(3) { - [1]=> - &string(10) "b2.changed" - [0]=> - &string(10) "b2.changed" - [2]=> - &string(10) "b2.changed" -} - - ---- 1,2 ref 0: -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - &int(1) -} -string(30) "a:3:{i:0;i:1;i:1;R:2;i:2;R:2;}" -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - &int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" - [2]=> - &string(10) "b0.changed" -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - &string(10) "b1.changed" -} -array(3) { - [0]=> - &string(10) "b2.changed" - [1]=> - &string(10) "b2.changed" - [2]=> - &string(10) "b2.changed" -} -Done ---UEXPECTF-- +--EXPECT-- --- No references: @@ -983,4 +541,4 @@ [2]=> &unicode(10) "b2.changed" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_arrays_003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_arrays_003.phpt diff -u php-src/ext/standard/tests/serialize/serialization_arrays_003.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_arrays_003.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_arrays_003.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_arrays_003.phpt Tue May 27 07:45:40 2008 @@ -70,229 +70,7 @@ echo "Done"; ?> ---EXPECTF-- - - ---- 0 refs external: -array(3) { - [0]=> - &int(1) - [1]=> - int(1) - [2]=> - int(1) -} -string(30) "a:3:{i:0;i:1;i:1;i:1;i:2;i:1;}" -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 1 refs external: -array(3) { - [0]=> - int(1) - [1]=> - &int(1) - [2]=> - int(1) -} -string(30) "a:3:{i:0;i:1;i:1;i:1;i:2;i:1;}" -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 2 refs external: -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - &int(1) -} -string(30) "a:3:{i:0;i:1;i:1;i:1;i:2;i:1;}" -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 1,2 ref external: -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - int(1) -} -string(30) "a:3:{i:0;i:1;i:1;R:2;i:2;i:1;}" -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 1,2,3 ref external: -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - &int(1) -} -string(30) "a:3:{i:0;i:1;i:1;R:2;i:2;R:2;}" -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - &int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" - [2]=> - &string(10) "b0.changed" -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - &string(10) "b1.changed" -} -array(3) { - [0]=> - &string(10) "b2.changed" - [1]=> - &string(10) "b2.changed" - [2]=> - &string(10) "b2.changed" -} -Done ---UEXPECTF-- +--EXPECT-- --- 0 refs external: @@ -513,4 +291,4 @@ [2]=> &unicode(10) "b2.changed" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_arrays_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_arrays_004.phpt diff -u php-src/ext/standard/tests/serialize/serialization_arrays_004.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_arrays_004.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_arrays_004.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_arrays_004.phpt Tue May 27 07:45:40 2008 @@ -51,421 +51,7 @@ echo "Done"; ?> ---EXPECTF-- - - ---- 1 refs container: -array(3) { - [0]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - int(1) - [2]=> - int(1) - } - [1]=> - int(1) - [2]=> - int(1) - } - [1]=> - int(1) - [2]=> - int(1) -} -string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;i:1;i:2;i:1;}i:1;i:1;i:2;i:1;}" -array(3) { - [0]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - int(1) - [2]=> - int(1) - } - [1]=> - int(1) - [2]=> - int(1) - } - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - %string(10) "b0.changed" - [1]=> - int(1) - [2]=> - int(1) -} -array(3) { - [0]=> - %string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - %string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 1,2 ref container: -array(3) { - [0]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [2]=> - int(1) - } - [1]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [2]=> - int(1) - } - [2]=> - int(1) -} -string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;i:1;}i:1;R:2;i:2;i:1;}" -array(3) { - [0]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [2]=> - int(1) - } - [1]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } - [2]=> - int(1) - } - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - string(10) "b2.changed" -} - - ---- 1,2,3 ref container: -array(3) { - [0]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - } - [1]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - } - [2]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *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;}" -array(3) { - [0]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - } - [1]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - } - [2]=> - &array(3) { - [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - } -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b0.changed" - [2]=> - &string(10) "b0.changed" -} -array(3) { - [0]=> - &string(10) "b1.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - &string(10) "b1.changed" -} -array(3) { - [0]=> - &string(10) "b2.changed" - [1]=> - &string(10) "b2.changed" - [2]=> - &string(10) "b2.changed" -} -Done ---UEXPECTF-- +--EXPECT-- --- 1 refs container: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_arrays_005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_arrays_005.phpt diff -u php-src/ext/standard/tests/serialize/serialization_arrays_005.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_arrays_005.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_arrays_005.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_arrays_005.phpt Tue May 27 07:45:40 2008 @@ -78,498 +78,7 @@ check($c); ?> ---EXPECTF-- - - ---- Nested array references 1 element in containing array: -array(3) { - [0]=> - &int(1) - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - &int(1) - [1]=> - int(1) - } -} -string(48) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;R:2;i:1;i:1;}}" -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - int(1) - [2]=> - array(2) { - [0]=> - &string(10) "b0.changed" - [1]=> - int(1) - } -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(10) "b0.changed" - [1]=> - int(1) - } -} -array(3) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - int(1) - } -} -array(3) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - string(12) "b2.1.changed" - } -} - - ---- Nested array references 1 element in containing array (slightly different): -array(3) { - [0]=> - &int(1) - [1]=> - &array(2) { - [0]=> - int(1) - [1]=> - &int(1) - } - [2]=> - int(1) -} -string(48) "a:3:{i:0;i:1;i:1;a:2:{i:0;i:1;i:1;R:2;}i:2;i:1;}" -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - array(2) { - [0]=> - int(1) - [1]=> - &string(10) "b0.changed" - } - [2]=> - int(1) -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - array(2) { - [0]=> - string(12) "b1.0.changed" - [1]=> - &string(10) "b0.changed" - } - [2]=> - int(1) -} -array(3) { - [0]=> - &string(12) "b1.1.changed" - [1]=> - array(2) { - [0]=> - string(12) "b1.0.changed" - [1]=> - &string(12) "b1.1.changed" - } - [2]=> - int(1) -} -array(3) { - [0]=> - &string(12) "b1.1.changed" - [1]=> - array(2) { - [0]=> - string(12) "b1.0.changed" - [1]=> - &string(12) "b1.1.changed" - } - [2]=> - string(10) "b2.changed" -} - - ---- Nested array references 2 elements in containing array: -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - &array(2) { - [0]=> - &int(1) - [1]=> - &int(1) - } -} -string(48) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;R:2;i:1;R:3;}}" -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &int(1) - [2]=> - array(2) { - [0]=> - &string(10) "b0.changed" - [1]=> - &int(1) - } -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b1.changed" - } -} -array(3) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(10) "b1.changed" - } -} -array(3) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(12) "b2.1.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(12) "b2.1.changed" - } -} - - ---- Containing array references 1 element in nested array: -array(3) { - [0]=> - int(1) - [1]=> - &int(1) - [2]=> - &array(2) { - [0]=> - &int(1) - [1]=> - int(1) - } -} -string(48) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;R:3;i:1;i:1;}}" -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &int(1) - [2]=> - array(2) { - [0]=> - &int(1) - [1]=> - int(1) - } -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(10) "b1.changed" - [1]=> - int(1) - } -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &string(12) "b2.0.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - int(1) - } -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - &string(12) "b2.0.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - string(12) "b2.1.changed" - } -} - - ---- Containing array references 2 elements in nested array: -array(3) { - [0]=> - &int(1) - [1]=> - &int(1) - [2]=> - &array(2) { - [0]=> - &int(1) - [1]=> - &int(1) - } -} -string(48) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;R:2;i:1;R:3;}}" -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &int(1) - [2]=> - array(2) { - [0]=> - &string(10) "b0.changed" - [1]=> - &int(1) - } -} -array(3) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(10) "b0.changed" - [1]=> - &string(10) "b1.changed" - } -} -array(3) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(10) "b1.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(10) "b1.changed" - } -} -array(3) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(12) "b2.1.changed" - [2]=> - array(2) { - [0]=> - &string(12) "b2.0.changed" - [1]=> - &string(12) "b2.1.changed" - } -} - - ---- Nested array references container: -array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } - } - } -} -string(74) "a:3:{i:0;i:1;i:1;i:1;i:2;a:2:{i:0;i:1;i:1;a:3:{i:0;i:1;i:1;i:1;i:2;R:4;}}}" -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } - } - } -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } - } - } -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - &array(2) { - [0]=> - string(12) "b2.0.changed" - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - &array(2) { - [0]=> - string(12) "b2.0.changed" - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } - } - } -} -array(3) { - [0]=> - string(10) "b0.changed" - [1]=> - string(10) "b1.changed" - [2]=> - &array(2) { - [0]=> - string(12) "b2.0.changed" - [1]=> - string(12) "b2.1.changed" - } -} ---UEXPECTF-- +--EXPECT-- --- Nested array references 1 element in containing array: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_error_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_error_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_error_001.phpt Tue May 27 07:45:40 2008 @@ -39,4 +39,4 @@ Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line 21 bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_miscTypes_001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_miscTypes_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_miscTypes_001.phpt:1.3 php-src/ext/standard/tests/serialize/serialization_miscTypes_001.phpt:1.4 --- php-src/ext/standard/tests/serialize/serialization_miscTypes_001.phpt:1.3 Wed Mar 19 12:36:00 2008 +++ php-src/ext/standard/tests/serialize/serialization_miscTypes_001.phpt Tue May 27 07:45:40 2008 @@ -104,249 +104,7 @@ echo "\nDone"; ?> ---EXPECTF-- ---- Testing Various Types --- - --- Iteration 0 -- -after serialization => string(13) "i:2147483647;" -after unserialization => int(2147483647) - --- Iteration 1 -- -after serialization => string(14) "i:-2147483647;" -after unserialization => int(-2147483647) - --- Iteration 2 -- -after serialization => string(13) "d:2147483648;" -after unserialization => float(2147483648) - --- Iteration 3 -- -after serialization => string(14) "d:-2147483648;" -after unserialization => float(-2147483648) - --- Iteration 4 -- -after serialization => string(12) "i:267387171;" -after unserialization => int(267387171) - --- Iteration 5 -- -after serialization => string(13) "i:-267387171;" -after unserialization => int(-267387171) - --- Iteration 6 -- -after serialization => string(13) "i:2147483647;" -after unserialization => int(2147483647) - --- Iteration 7 -- -after serialization => string(14) "i:-2147483647;" -after unserialization => int(-2147483647) - --- Iteration 8 -- -after serialization => string(13) "d:2147483648;" -after unserialization => float(2147483648) - --- Iteration 9 -- -after serialization => string(14) "d:-2147483648;" -after unserialization => float(-2147483648) - --- Iteration 10 -- -after serialization => string(9) "i:342391;" -after unserialization => int(342391) - --- Iteration 11 -- -after serialization => string(10) "i:-342391;" -after unserialization => int(-342391) - --- Iteration 12 -- -after serialization => string(6) "a:0:{}" -after unserialization => array(0) { -} - --- Iteration 13 -- -after serialization => string(57) "a:5:{i:0;i:1;i:1;i:2;i:2;i:3;i:3;i:12345666;i:4;i:-2344;}" -after unserialization => array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(12345666) - [4]=> - int(-2344) -} - --- Iteration 14 -- -after serialization => string(303) "a:16:{i:0;i:0;i:1;i:1;i:2;i:2;i:3;d:3.3330000000000001847411112976260483264923095703125;i:4;i:-4;i:5;d:-5.55499999999999971578290569595992565155029296875;i:6;b:1;i:7;b:0;i:8;N;i:9;S:0:"";i:10;S:0:"";i:11;S:1:" ";i:12;a:0:{}i:13;a:3:{i:0;i:1;i:1;i:2;i:2;a:0:{}}i:14;S:6:"string";i:15;O:8:"stdClass":0:{}}" -after unserialization => array(16) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(2) - [3]=> - float(3.333) - [4]=> - int(-4) - [5]=> - float(-5.555) - [6]=> - bool(true) - [7]=> - bool(false) - [8]=> - NULL - [9]=> - string(0) "" - [10]=> - string(0) "" - [11]=> - string(1) " " - [12]=> - array(0) { - } - [13]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - array(0) { - } - } - [14]=> - string(6) "string" - [15]=> - object(stdClass)#2 (0) { - } -} - --- Iteration 15 -- -after serialization => string(129) "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:1:{i:0;N;}}" -after unserialization => array(7) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(-2) - [3]=> - float(3.333333) - [4]=> - string(1) "a" - [5]=> - array(0) { - } - [6]=> - array(1) { - [0]=> - NULL - } -} - --- Iteration 16 -- -after serialization => string(2) "N;" -after unserialization => NULL - --- Iteration 17 -- -after serialization => string(2) "N;" -after unserialization => NULL - --- Iteration 18 -- -after serialization => string(7) "S:0:"";" -after unserialization => string(0) "" - --- Iteration 19 -- -after serialization => string(7) "S:0:"";" -after unserialization => string(0) "" - --- Iteration 20 -- -after serialization => string(8) "S:1:" ";" -after unserialization => string(1) " " - --- Iteration 21 -- -after serialization => string(8) "S:1:" ";" -after unserialization => string(1) " " - --- Iteration 22 -- -after serialization => string(8) "S:1:"a";" -after unserialization => string(1) "a" - --- Iteration 23 -- -after serialization => string(13) "S:6:"string";" -after unserialization => string(6) "string" - --- Iteration 24 -- -after serialization => string(13) "S:6:"string";" -after unserialization => string(6) "string" - --- Iteration 25 -- -after serialization => string(13) "S:6:"hello-after unserialization => string(6) "hello- --- Iteration 26 -- -after serialization => string(16) "S:7:"hello\5c0";" -after unserialization => string(7) "hello\0" - --- Iteration 27 -- -after serialization => string(10) "S:3:"123";" -after unserialization => string(3) "123" - --- Iteration 28 -- -after serialization => string(10) "S:3:"123";" -after unserialization => string(3) "123" - --- Iteration 29 -- -after serialization => string(11) "S:2:"\5ct";" -after unserialization => string(2) "\t" - --- Iteration 30 -- -after serialization => string(8) "S:1:" ";" -after unserialization => string(1) " " - --- Iteration 31 -- -after serialization => string(4) "b:1;" -after unserialization => bool(true) - --- Iteration 32 -- -after serialization => string(4) "b:1;" -after unserialization => bool(true) - --- Iteration 33 -- -after serialization => string(4) "b:0;" -after unserialization => bool(false) - --- Iteration 34 -- -after serialization => string(4) "b:0;" -after unserialization => bool(false) - --- Iteration 35 -- -after serialization => string(14) "S:7:"TRUE123";" -after unserialization => string(7) "TRUE123" - --- Iteration 36 -- -after serialization => string(16) "S:9:"123string";" -after unserialization => string(9) "123string" - --- Iteration 37 -- -after serialization => string(16) "S:9:"string123";" -after unserialization => string(9) "string123" - --- Iteration 38 -- -after serialization => string(18) "S:10:"NULLstring";" -after unserialization => string(10) "NULLstring" - --- Iteration 39 -- -after serialization => string(2) "N;" -after unserialization => NULL - --- Iteration 40 -- -after serialization => string(2) "N;" -after unserialization => NULL - -Done ---UEXPECTF-- +--EXPECT-- --- Testing Various Types --- -- Iteration 0 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_001.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_002.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_003.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_003.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_003.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_003.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_003.phpt Tue May 27 07:45:40 2008 @@ -52,21 +52,6 @@ ?> --EXPECTF-- --- Testing Abstract Class --- -string(119) "O:10:"extendName":3:{S:1:"a";i:10;S:1:"b";d:12.2219999999999995310417943983338773250579833984375;S:1:"c";S:6:"string";}" -object(extendName)#%d (3) { - ["a"]=> - int(10) - ["b"]=> - float(12.222) - ["c"]=> - string(6) "string" -} -string(18) "S:10:"extendName";" -string(10) "extendName" - -Done ---UEXPECTF-- ---- Testing Abstract Class --- unicode(119) "O:10:"extendName":3:{U:1:"a";i:10;U:1:"b";d:12.2219999999999995310417943983338773250579833984375;U:1:"c";U:6:"string";}" object(extendName)#%d (3) { [u"a"]=> @@ -79,4 +64,4 @@ unicode(18) "U:10:"extendName";" unicode(10) "extendName" -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_004.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_004.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_004.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_004.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_004.phpt Tue May 27 07:45:40 2008 @@ -39,19 +39,11 @@ echo "Done"; ?> ---EXPECTF-- -string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" -string(22) "a:2:{i:0;i:1;i:1;i:1;}" -string(30) "a:2:{i:0;S:1:"a";i:1;S:1:"a";}" -string(22) "a:2:{i:0;b:1;i:1;b:1;}" -string(18) "a:2:{i:0;N;i:1;N;}" -string(26) "a:2:{i:0;a:0:{}i:1;a:0:{}}" -Done ---UEXPECTF-- +--EXPECT-- unicode(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" unicode(22) "a:2:{i:0;i:1;i:1;i:1;}" unicode(30) "a:2:{i:0;U:1:"a";i:1;U:1:"a";}" unicode(22) "a:2:{i:0;b:1;i:1;b:1;}" unicode(18) "a:2:{i:0;N;i:1;N;}" unicode(26) "a:2:{i:0;a:0:{}i:1;a:0:{}}" -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_005.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_005.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_005.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_005.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_005.phpt Tue May 27 07:45:40 2008 @@ -66,61 +66,6 @@ --EXPECTF-- ---> Various types of access on complete class: object(C)#%d (1) { - ["p"]=> - int(1) -} -bool(true) -int(1) -string(13) "ref1.original" -string(12) "ref1.changed" -string(9) "p.changed" -bool(false) -bool(true) - -Notice: Undefined property: C::$x in %s on line 37 -NULL - - ----> Same types of access on incomplete class: -object(__PHP_Incomplete_Class)#%d (2) { - ["__PHP_Incomplete_Class_Name"]=> - string(1) "C" - ["p"]=> - int(1) -} -bool(false) - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 43 -NULL - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 46 - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 47 -NULL - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 49 -NULL - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 50 -string(9) "p.changed" - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 53 -bool(false) - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 54 - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 55 -bool(false) - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 56 - -Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 57 -NULL - -Fatal error: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 59 ---UEXPECTF-- ----> Various types of access on complete class: -object(C)#%d (1) { [u"p"]=> int(1) } @@ -172,4 +117,4 @@ Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 57 NULL -Fatal error: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 59 \ No newline at end of file +Fatal error: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 59 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_006.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_006.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_006.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_006.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_006.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_006.phpt Tue May 27 07:45:40 2008 @@ -25,4 +25,4 @@ Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line 15 NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_007.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_007.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_007.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_007.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_007.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_007.phpt Tue May 27 07:45:40 2008 @@ -36,18 +36,7 @@ Warning: unserialize(): Function check() hasn't defined the class it was called for in %s on line 23 object(__PHP_Incomplete_Class)#%d (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(3) "FOO" -} -Done ---UEXPECTF-- -in __autoload(FOO) -in check(FOO) -in __autoload(FOO) - -Warning: unserialize(): Function check() hasn't defined the class it was called for in %s on line 23 -object(__PHP_Incomplete_Class)#%d (1) { [u"__PHP_Incomplete_Class_Name"]=> unicode(3) "FOO" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_008.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_008.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_008.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_008.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_008.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_008.phpt Tue May 27 07:45:40 2008 @@ -22,15 +22,7 @@ Warning: unserialize(): defined (Nonexistent) but not found in %s on line 14 object(__PHP_Incomplete_Class)#%d (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(3) "FOO" -} -Done ---UEXPECTF-- - -Warning: unserialize(): defined (Nonexistent) but not found in %s on line 14 -object(__PHP_Incomplete_Class)#%d (1) { [u"__PHP_Incomplete_Class_Name"]=> unicode(3) "FOO" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_009.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_009.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_009.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_009.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_009.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_009.phpt Tue May 27 07:45:40 2008 @@ -33,4 +33,4 @@ Notice: unserialize(): Error at offset 6 of 18 bytes in %s on line 16 bool(false) bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_010.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_010.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_010.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_010.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_010.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_010.phpt Tue May 27 07:45:40 2008 @@ -34,4 +34,4 @@ ?> --EXPECTF-- C::serialize() must return a string or NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_011.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_011.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_011.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_011.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_011.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_011.phpt Tue May 27 07:45:40 2008 @@ -82,124 +82,6 @@ Before serialization: object(A)#%d (3) { - ["APriv":"A":private]=> - string(7) "A.APriv" - ["AProt":protected]=> - string(7) "A.AProt" - ["APub"]=> - string(6) "A.APub" -} -Serialized form: -string(98) "O:1:"A":3:{S:8:"\0A\0APriv";S:7:"A.APriv";S:8:"\0*\0AProt";S:7:"A.AProt";S:4:"APub";S:6:"A.APub";}" -Unserialized: -object(A)#%d (3) { - ["APriv":"A":private]=> - string(7) "A.APriv" - ["AProt":protected]=> - string(7) "A.AProt" - ["APub"]=> - string(6) "A.APub" -} -Sanity check: bool(true) - - --- Test instance of B -- - - -Before serialization: -object(B)#%d (6) { - ["BPriv":"B":private]=> - string(7) "B.BPriv" - ["BProt":protected]=> - string(7) "B.BProt" - ["BPub"]=> - string(6) "B.BPub" - ["APriv":"A":private]=> - string(7) "A.APriv" - ["AProt":protected]=> - string(7) "A.AProt" - ["APub"]=> - string(6) "A.APub" -} -Serialized form: -string(184) "O:1:"B":6:{S:8:"\0B\0BPriv";S:7:"B.BPriv";S:8:"\0*\0BProt";S:7:"B.BProt";S:4:"BPub";S:6:"B.BPub";S:8:"\0A\0APriv";S:7:"A.APriv";S:8:"\0*\0AProt";S:7:"A.AProt";S:4:"APub";S:6:"A.APub";}" -Unserialized: -object(B)#%d (6) { - ["BPriv":"B":private]=> - string(7) "B.BPriv" - ["BProt":protected]=> - string(7) "B.BProt" - ["BPub"]=> - string(6) "B.BPub" - ["APriv":"A":private]=> - string(7) "A.APriv" - ["AProt":protected]=> - string(7) "A.AProt" - ["APub"]=> - string(6) "A.APub" -} -Sanity check: bool(true) - - --- Test instance of C -- - - -Before serialization: -object(C)#%d (10) { - ["APriv":"C":private]=> - string(7) "C.APriv" - ["AProt":protected]=> - string(7) "C.AProt" - ["APub"]=> - string(6) "C.APub" - ["CPriv":"C":private]=> - string(7) "C.CPriv" - ["CProt":protected]=> - string(7) "C.BProt" - ["CPub"]=> - string(6) "C.CPub" - ["BPriv":"B":private]=> - string(7) "B.BPriv" - ["BProt":protected]=> - string(7) "B.BProt" - ["BPub"]=> - string(6) "B.BPub" - ["APriv":"A":private]=> - string(7) "A.APriv" -} -Serialized form: -string(302) "O:1:"C":10:{S:8:"\0C\0APriv";S:7:"C.APriv";S:8:"\0*\0AProt";S:7:"C.AProt";S:4:"APub";S:6:"C.APub";S:8:"\0C\0CPriv";S:7:"C.CPriv";S:8:"\0*\0CProt";S:7:"C.BProt";S:4:"CPub";S:6:"C.CPub";S:8:"\0B\0BPriv";S:7:"B.BPriv";S:8:"\0*\0BProt";S:7:"B.BProt";S:4:"BPub";S:6:"B.BPub";S:8:"\0A\0APriv";S:7:"A.APriv";}" -Unserialized: -object(C)#%d (10) { - ["APriv":"C":private]=> - string(7) "C.APriv" - ["AProt":protected]=> - string(7) "C.AProt" - ["APub"]=> - string(6) "C.APub" - ["CPriv":"C":private]=> - string(7) "C.CPriv" - ["CProt":protected]=> - string(7) "C.BProt" - ["CPub"]=> - string(6) "C.CPub" - ["BPriv":"B":private]=> - string(7) "B.BPriv" - ["BProt":protected]=> - string(7) "B.BProt" - ["BPub"]=> - string(6) "B.BPub" - ["APriv":"A":private]=> - string(7) "A.APriv" -} -Sanity check: bool(true) -Done ---UEXPECTF-- --- Test instance of A -- - - -Before serialization: -object(A)#%d (3) { [u"APriv":u"A":private]=> unicode(7) "A.APriv" [u"AProt":protected]=> @@ -311,4 +193,4 @@ unicode(7) "A.APriv" } Sanity check: bool(true) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_012.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_012.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_012.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_012.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_012.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_012.phpt Tue May 27 07:45:40 2008 @@ -85,165 +85,6 @@ ?> --EXPECTF-- - -Array containing same object twice: -array(2) { - [0]=> - object(stdClass)#%d (0) { - } - [1]=> - object(stdClass)#%d (0) { - } -} -string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" -array(2) { - [0]=> - object(stdClass)#%d (0) { - } - [1]=> - object(stdClass)#%d (0) { - } -} -array(2) { - [0]=> - object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } - [1]=> - object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } -} -array(2) { - [0]=> - string(10) "a0.changed" - [1]=> - object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } -} - - -Array containing object and reference to that object: -array(2) { - [0]=> - &object(stdClass)#%d (0) { - } - [1]=> - &object(stdClass)#%d (0) { - } -} -string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;R:2;}" -array(2) { - [0]=> - &object(stdClass)#%d (0) { - } - [1]=> - &object(stdClass)#%d (0) { - } -} -array(2) { - [0]=> - &object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } - [1]=> - &object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } -} -array(2) { - [0]=> - &string(10) "a0.changed" - [1]=> - &string(10) "a0.changed" -} - - -Object containing same object twice:object(stdClass)#%d (2) { - ["a"]=> - object(stdClass)#%d (0) { - } - ["b"]=> - object(stdClass)#%d (0) { - } -} -string(58) "O:8:"stdClass":2:{S:1:"a";O:8:"stdClass":0:{}S:1:"b";r:2;}" -object(stdClass)#%d (2) { - ["a"]=> - object(stdClass)#%d (0) { - } - ["b"]=> - object(stdClass)#%d (0) { - } -} -object(stdClass)#%d (2) { - ["a"]=> - object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } - ["b"]=> - object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } -} -object(stdClass)#%d (2) { - ["a"]=> - string(20) "container->a.changed" - ["b"]=> - object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } -} - - -Object containing object and reference to that object: -object(stdClass)#%d (2) { - ["a"]=> - &object(stdClass)#%d (0) { - } - ["b"]=> - &object(stdClass)#%d (0) { - } -} -string(58) "O:8:"stdClass":2:{S:1:"a";O:8:"stdClass":0:{}S:1:"b";R:2;}" -object(stdClass)#%d (2) { - ["a"]=> - &object(stdClass)#%d (0) { - } - ["b"]=> - &object(stdClass)#%d (0) { - } -} -object(stdClass)#%d (2) { - ["a"]=> - &object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } - ["b"]=> - &object(stdClass)#%d (1) { - ["a"]=> - string(7) "newProp" - } -} -object(stdClass)#%d (2) { - ["a"]=> - &string(20) "container->a.changed" - ["b"]=> - &string(20) "container->a.changed" -} -Done ---UEXPECTF-- - Array containing same object twice: array(2) { [0]=> @@ -399,4 +240,4 @@ [u"b"]=> &unicode(20) "container->a.changed" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_013.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_013.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_013.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_013.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_013.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_013.phpt Tue May 27 07:45:40 2008 @@ -99,402 +99,6 @@ --- a refs b: object(stdClass)#%d (3) { - ["b"]=> - &int(1) - ["a"]=> - &int(1) - ["c"]=> - int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"b";i:1;S:1:"a";R:2;S:1:"c";i:1;}" -object(stdClass)#%d (3) { - ["b"]=> - &int(1) - ["a"]=> - &int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["b"]=> - &string(14) "obj->a.changed" - ["a"]=> - &string(14) "obj->a.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["b"]=> - &string(14) "obj->b.changed" - ["a"]=> - &string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["b"]=> - &string(14) "obj->b.changed" - ["a"]=> - &string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a refs c: -object(stdClass)#%d (3) { - ["c"]=> - &int(1) - ["a"]=> - &int(1) - ["b"]=> - int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"c";i:1;S:1:"a";R:2;S:1:"b";i:1;}" -object(stdClass)#%d (3) { - ["c"]=> - &int(1) - ["a"]=> - &int(1) - ["b"]=> - int(1) -} -object(stdClass)#%d (3) { - ["c"]=> - &string(14) "obj->a.changed" - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - int(1) -} -object(stdClass)#%d (3) { - ["c"]=> - &string(14) "obj->a.changed" - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["c"]=> - &string(14) "obj->c.changed" - ["a"]=> - &string(14) "obj->c.changed" - ["b"]=> - string(14) "obj->b.changed" -} - - ---- b refs a: -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";R:2;S:1:"c";i:1;}" -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- b refs c: -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["c"]=> - &int(1) - ["b"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"c";i:1;S:1:"b";R:3;}" -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["c"]=> - &int(1) - ["b"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["c"]=> - &int(1) - ["b"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["c"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["c"]=> - &string(14) "obj->c.changed" - ["b"]=> - &string(14) "obj->c.changed" -} - - ---- c refs a: -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - int(1) - ["c"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";i:1;S:1:"c";R:2;}" -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - int(1) - ["c"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - int(1) - ["c"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->c.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->c.changed" -} - - ---- c refs b: -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";i:1;S:1:"c";R:3;}" -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->c.changed" - ["c"]=> - &string(14) "obj->c.changed" -} - - ---- a,b refs c: -object(stdClass)#%d (3) { - ["c"]=> - &int(1) - ["a"]=> - &int(1) - ["b"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"c";i:1;S:1:"a";R:2;S:1:"b";R:2;}" -object(stdClass)#%d (3) { - ["c"]=> - &int(1) - ["a"]=> - &int(1) - ["b"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["c"]=> - &string(14) "obj->a.changed" - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["c"]=> - &string(14) "obj->b.changed" - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["c"]=> - &string(14) "obj->c.changed" - ["a"]=> - &string(14) "obj->c.changed" - ["b"]=> - &string(14) "obj->c.changed" -} - - ---- a,c refs b: -object(stdClass)#%d (3) { - ["b"]=> - &int(1) - ["a"]=> - &int(1) - ["c"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"b";i:1;S:1:"a";R:2;S:1:"c";R:2;}" -object(stdClass)#%d (3) { - ["b"]=> - &int(1) - ["a"]=> - &int(1) - ["c"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["b"]=> - &string(14) "obj->a.changed" - ["a"]=> - &string(14) "obj->a.changed" - ["c"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["b"]=> - &string(14) "obj->b.changed" - ["a"]=> - &string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["b"]=> - &string(14) "obj->c.changed" - ["a"]=> - &string(14) "obj->c.changed" - ["c"]=> - &string(14) "obj->c.changed" -} - - ---- b,c refs a: -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";R:2;S:1:"c";R:2;}" -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" - ["c"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->c.changed" - ["b"]=> - &string(14) "obj->c.changed" - ["c"]=> - &string(14) "obj->c.changed" -} -Done ---UEXPECTF-- ---- a refs b: -object(stdClass)#%d (3) { [u"b"]=> &int(1) [u"a"]=> @@ -887,4 +491,4 @@ [u"c"]=> &unicode(14) "obj->c.changed" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_014.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_014.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_014.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_014.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_014.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_014.phpt Tue May 27 07:45:40 2008 @@ -76,226 +76,6 @@ --- a refs external: object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - int(1) - ["c"]=> - int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";i:1;S:1:"c";i:1;}" -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- b refs external: -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - &int(1) - ["c"]=> - int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";i:1;S:1:"c";i:1;}" -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- c refs external: -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - int(1) - ["c"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";i:1;S:1:"c";i:1;}" -object(stdClass)#%d (3) { - ["a"]=> - int(1) - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a,b ref external: -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";R:2;S:1:"c";i:1;}" -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a,b,c ref external: -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -string(55) "O:8:"stdClass":3:{S:1:"a";i:1;S:1:"b";R:2;S:1:"c";R:2;}" -object(stdClass)#%d (3) { - ["a"]=> - &int(1) - ["b"]=> - &int(1) - ["c"]=> - &int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" - ["c"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->c.changed" - ["b"]=> - &string(14) "obj->c.changed" - ["c"]=> - &string(14) "obj->c.changed" -} -Done ---UEXPECTF-- ---- a refs external: -object(stdClass)#%d (3) { [u"a"]=> &int(1) [u"b"]=> @@ -512,4 +292,4 @@ [u"c"]=> &unicode(14) "obj->c.changed" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_objects_015.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_objects_015.phpt diff -u php-src/ext/standard/tests/serialize/serialization_objects_015.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_objects_015.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_objects_015.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_objects_015.phpt Tue May 27 07:45:41 2008 @@ -73,466 +73,6 @@ --EXPECTF-- --- a refs container: object(stdClass)#%d (3) { - ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - int(1) - ["c"]=> - int(1) - } - ["b"]=> - int(1) - ["c"]=> - int(1) -} -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) - } - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a eqs container: -object(stdClass)#%d (3) { - ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - int(1) - ["c"]=> - int(1) - } - ["b"]=> - int(1) - ["c"]=> - int(1) -} -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) - } - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - int(1) - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a,b ref container: -object(stdClass)#%d (3) { - ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } - ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } - ["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) - } - ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a,b eq container: -object(stdClass)#%d (3) { - ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } - ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } - ["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) - } - ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } - ["c"]=> - int(1) -} -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) - } - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - int(1) -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} - - ---- a,b,c ref container: -object(stdClass)#%d (3) { - ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } - ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } - ["c"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *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* - } - ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } - ["c"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->a.changed" - ["b"]=> - &string(14) "obj->a.changed" - ["c"]=> - &string(14) "obj->a.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->b.changed" - ["b"]=> - &string(14) "obj->b.changed" - ["c"]=> - &string(14) "obj->b.changed" -} -object(stdClass)#%d (3) { - ["a"]=> - &string(14) "obj->c.changed" - ["b"]=> - &string(14) "obj->c.changed" - ["c"]=> - &string(14) "obj->c.changed" -} - - ---- a,b,c eq container: -object(stdClass)#%d (3) { - ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } - ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } - ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *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* - } - ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } - ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *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* - } - ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["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* - } -} -object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - string(14) "obj->c.changed" -} -Done ---UEXPECTF-- ---- a refs container: -object(stdClass)#%d (3) { [u"a"]=> &object(stdClass)#%d (3) { [u"a"]=> @@ -989,4 +529,4 @@ [u"c"]=> unicode(14) "obj->c.changed" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_precision_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_precision_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_precision_001.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_precision_001.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_precision_001.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_precision_001.phpt Tue May 27 07:45:41 2008 @@ -18,6 +18,4 @@ var_dump(serialize(0.1)); ?> --EXPECTF-- -string(6) "d:0.1;" ---UEXPECTF-- -unicode(6) "d:0.1;" \ No newline at end of file +unicode(6) "d:0.1;" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_precision_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_precision_002.phpt diff -u php-src/ext/standard/tests/serialize/serialization_precision_002.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_precision_002.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_precision_002.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_precision_002.phpt Tue May 27 07:45:41 2008 @@ -18,6 +18,4 @@ var_dump(serialize(0.1)); ?> --EXPECTF-- -string(60) "d:0.1000000000000000055511151231257827021181583404541015625;" ---UEXPECTF-- -unicode(60) "d:0.1000000000000000055511151231257827021181583404541015625;" \ No newline at end of file +unicode(60) "d:0.1000000000000000055511151231257827021181583404541015625;" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_resources_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_resources_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_resources_001.phpt:1.2 php-src/ext/standard/tests/serialize/serialization_resources_001.phpt:1.3 --- php-src/ext/standard/tests/serialize/serialization_resources_001.phpt:1.2 Tue Mar 18 15:12:42 2008 +++ php-src/ext/standard/tests/serialize/serialization_resources_001.phpt Tue May 27 07:45:41 2008 @@ -24,13 +24,7 @@ ?> --EXPECTF-- --- Testing Resource --- -string(4) "i:%d;" -int(%d) - -Done ---UEXPECTF-- ---- Testing Resource --- unicode(4) "i:%d;" int(%d) -Done \ No newline at end of file +Done