com php-src: some missing pieces for __debugInfo: Zend/ zend_compile.c
| From: | Anatol Belski | Date: | Thu, 20 Feb 2014 01:07:34 +0000 |
| Subject: | com php-src: some missing pieces for __debugInfo: Zend/ zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76127@lists.php.net to get a copy of this message | ||
Commit: 47204c63416ad741666186b2522b362df741ea42
Author: Anatol Belski <ab@php.net> Thu, 20 Feb 2014 02:07:34 +0100
Parents: e272225e2a7b7725fdc9741a549ba428acca49e7
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=47204c63416ad741666186b2522b362df741ea42
Log:
some missing pieces for __debugInfo
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 34cc6cd..a31c401 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3133,6 +3133,9 @@ static void do_inherit_parent_constructor(zend_class_entry *ce) /* {{{ */
if (!ce->destructor) {
ce->destructor = ce->parent->destructor;
}
+ if (!ce->__debugInfo) {
+ ce->__debugInfo = ce->parent->__debugInfo;
+ }
if (ce->constructor) {
if (ce->parent->constructor && ce->parent->constructor->common.fn_flags
& ZEND_ACC_FINAL) {
zend_error(E_ERROR, "Cannot override final %s::%s() with %s::%s()",
@@ -6958,6 +6961,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool
nullify
ce->unserialize = NULL;
ce->serialize_func = NULL;
ce->unserialize_func = NULL;
+ ce->__debugInfo = NULL;
if (ce->type == ZEND_INTERNAL_CLASS) {
ce->info.internal.module = NULL;
ce->info.internal.builtin_functions = NULL;