From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 12 Jul 2016 04:18:09 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~101^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f71fcf8bdd685eda621c5671f094ea7fdf2c36f4;p=php

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
---

f71fcf8bdd685eda621c5671f094ea7fdf2c36f4
diff --cc ext/standard/tests/serialize/bug69152.phpt
index be3aa273ed,4e741685cc..b766c0afbd
--- 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 fc76771299,0000000000..93843c606b
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
 +  }
 +}