tony2001 Tue Dec 19 12:45:03 2006 UTC
Modified files:
/php-src/ext/standard/tests/serialize 001.phpt 006.phpt
bug14293.phpt bug21957.phpt
Log:
fix serialize tests after s: -> S: change
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/001.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/standard/tests/serialize/001.phpt
diff -u php-src/ext/standard/tests/serialize/001.phpt:1.8
php-src/ext/standard/tests/serialize/001.phpt:1.9
--- php-src/ext/standard/tests/serialize/001.phpt:1.8 Mon Mar 27 13:37:47 2006
+++ php-src/ext/standard/tests/serialize/001.phpt Tue Dec 19 12:45:03 2006
@@ -87,15 +87,15 @@
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";}
+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";}
+O:1:"s":2:{S:1:"a";S:5:"hallo";S:1:"c";S:5:"world";}
__wakeup called
object(s)#%d (3) {
["a"]=>
@@ -111,7 +111,7 @@
["b"]=>
&string(4) "test"
}
-a:2:{s:1:"a";s:4:"test";s:1:"b";R:2;}
+a:2:{S:1:"a";S:4:"test";S:1:"b";R:2;}
array(2) {
["a"]=>
&string(4) "test"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/006.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/serialize/006.phpt
diff -u php-src/ext/standard/tests/serialize/006.phpt:1.3
php-src/ext/standard/tests/serialize/006.phpt:1.4
--- php-src/ext/standard/tests/serialize/006.phpt:1.3 Mon Mar 27 13:37:47 2006
+++ php-src/ext/standard/tests/serialize/006.phpt Tue Dec 19 12:45:03 2006
@@ -20,12 +20,12 @@
var_dump(unserialize(serialize($åäöÅÄÖ)));
?>
--EXPECT--
-string(55) "O:11:"ÜberKööliäå":1:{s:11:"åäöÅÄÖüÜber";s:6:"åäöÅÄÖ";}"
+string(55) "O:11:"ÜberKööliäå":1:{S:11:"åäöÅÄÖüÜber";S:6:"åäöÅÄÖ";}"
object(ÜberKööliäå)#2 (1) {
["åäöÅÄÖüÜber"]=>
string(6) "åäöÅÄÖ"
}
-string(32) "a:1:{s:6:"åäöÅÄÖ";s:6:"åäöÅÄÖ";}"
+string(32) "a:1:{S:6:"åäöÅÄÖ";S:6:"åäöÅÄÖ";}"
array(1) {
["åäöÅÄÖ"]=>
string(6) "åäöÅÄÖ"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug14293.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/serialize/bug14293.phpt
diff -u php-src/ext/standard/tests/serialize/bug14293.phpt:1.4
php-src/ext/standard/tests/serialize/bug14293.phpt:1.5
--- php-src/ext/standard/tests/serialize/bug14293.phpt:1.4 Mon Mar 27
13:37:47 2006
+++ php-src/ext/standard/tests/serialize/bug14293.phpt Tue Dec 19 12:45:03 2006
@@ -27,7 +27,7 @@
__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;}
+O:1:"t":2:{S:1:"a";S:5:"hello";S:1:"b";N;}
object(t)#%d (2) {
["a"]=>
string(5) "hello"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug21957.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/serialize/bug21957.phpt
diff -u php-src/ext/standard/tests/serialize/bug21957.phpt:1.3
php-src/ext/standard/tests/serialize/bug21957.phpt:1.4
--- php-src/ext/standard/tests/serialize/bug21957.phpt:1.3 Mon Mar 27
13:37:47 2006
+++ php-src/ext/standard/tests/serialize/bug21957.phpt Tue Dec 19 12:45:03 2006
@@ -40,7 +40,7 @@
int(2)
}
}
-a:2:{s:3:"one";s:3:"ABC";s:3:"two";N;}
+a:2:{S:3:"one";S:3:"ABC";S:3:"two";N;}
array(2) {
["one"]=>
string(3) "ABC"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
