Skip to content

Commit b47c49d

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
2 parents 125578c + f697874 commit b47c49d

File tree

3 files changed

+663
-590
lines changed

3 files changed

+663
-590
lines changed

ext/standard/tests/serialize/bug70963.phpt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var_dump(unserialize('a:2:{i:0;O:9:"exception":1:{s:16:"'."\0".'Exception'."\0".
66
var_dump(unserialize('a:2:{i:0;O:9:"exception":1:{s:16:"'."\0".'Exception'."\0".'trace";s:4:"test";}i:1;r:3;}'));
77
?>
88
--EXPECTF--
9-
array(1) {
9+
array(2) {
1010
[0]=>
1111
object(Exception)#%d (6) {
1212
["message":protected]=>
@@ -22,8 +22,10 @@ array(1) {
2222
["previous":"Exception":private]=>
2323
NULL
2424
}
25+
[1]=>
26+
string(4) "test"
2527
}
26-
array(1) {
28+
array(2) {
2729
[0]=>
2830
object(Exception)#%d (6) {
2931
["message":protected]=>
@@ -39,4 +41,6 @@ array(1) {
3941
["previous":"Exception":private]=>
4042
NULL
4143
}
44+
[1]=>
45+
string(4) "test"
4246
}

0 commit comments

Comments
 (0)