com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/tests/serialize/bug69152.phpt ext/standard/tests/serialize/bug69793.phpt
ext/standard/tests/serialize/bug70963.phpt

From: Date: Tue, 12 Jul 2016 04:18:09 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/tests/serialize/bug69152.phpt ext/standard/tests/serialize/bug69793.phpt
ext/standard/tests/serialize/bug70963.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92945@lists.php.net to get a copy of this message
Commit: f71fcf8bdd685eda621c5671f094ea7fdf2c36f4 Author: Xinchen Hui <laruence@gmail.com> Tue, 12 Jul 2016 12:18:09 +0800 Parents: 42902919bc0f97977e116415c9968dc6b23b12d2 7903276f4c18fcfda06c02785f0b4201421f9c7c Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f71fcf8bdd685eda621c5671f094ea7fdf2c36f4 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: backport to 5.6 (we should not unset the default value) Conflicts: Zend/zend_exceptions.c ext/standard/tests/serialize/bug69152.phpt Bugs: https://bugs.php.net/69152 Changed paths: MM ext/standard/tests/serialize/bug69152.phpt MM ext/standard/tests/serialize/bug69793.phpt MA ext/standard/tests/serialize/bug70963.phpt Diff: diff --cc ext/standard/tests/serialize/bug69152.phpt index be3aa27,4e74168..b766c0a --- a/ext/standard/tests/serialize/bug69152.phpt +++ b/ext/standard/tests/serialize/bug69152.phpt @@@ -9,8 -9,7 +9,7 @@@ $x->test() ?> --EXPECTF-- - Notice: Undefined property: Exception::$previous in %s on line %d -exception 'Exception' in %s:%d +Exception in %s:%d Stack trace: #0 {main} diff --cc ext/standard/tests/serialize/bug70963.phpt index fc76771,0000000..93843c6 mode 100644,000000..100644 --- a/ext/standard/tests/serialize/bug70963.phpt +++ b/ext/standard/tests/serialize/bug70963.phpt @@@ -1,38 -1,0 +1,42 @@@ +--TEST-- +Bug #70963 (Unserialize shows UNKNOW in result) +--FILE-- +<?php +var_dump(unserialize('a:2:{i:0;O:9:"exception":1:{s:16:"'."\0".'Exception'.."\0".'trace";s:4:"test";}i:1;R:3;}')); +var_dump(unserialize('a:2:{i:0;O:9:"exception":1:{s:16:"'."\0".'Exception'."\0".'trace";s:4:"test";}i:1;r:3;}')); +?> +--EXPECTF-- +array(1) { + [0]=> - object(Exception)#%d (5) { ++ object(Exception)#%d (6) { + ["message":protected]=> + string(0) "" + ["string":"Exception":private]=> + string(0) "" + ["code":protected]=> + int(0) + ["file":protected]=> + string(%d) "%s" + ["line":protected]=> - int(%d) ++ int(2) ++ ["previous":"Exception":private]=> ++ NULL + } +} +array(1) { + [0]=> - object(Exception)#%d (5) { ++ object(Exception)#%d (6) { + ["message":protected]=> + string(0) "" + ["string":"Exception":private]=> + string(0) "" + ["code":protected]=> + int(0) + ["file":protected]=> + string(%d) "%s" + ["line":protected]=> - int(%d) ++ int(3) ++ ["previous":"Exception":private]=> ++ NULL + } +}

« previous php.cvs (#92945) next »