Merge branch 'PHP-5.6'

* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
This commit is contained in:
Dmitry Stogov 2014-05-18 20:56:34 +04:00
commit 91c475fc00

View File

@ -685,6 +685,12 @@ static int zend_update_parent_ce(zend_class_entry **pce TSRMLS_DC)
ce->__callstatic = zend_shared_alloc_get_xlat_entry(ce->__callstatic);
ce->__callstatic->op_array.refcount++;
}
#endif
#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO
if (ce->__debugInfo) {
ce->__debugInfo = zend_shared_alloc_get_xlat_entry(ce->__debugInfo);
ce->__debugInfo->op_array.refcount++;
}
#endif
zend_hash_apply(&ce->properties_info, (apply_func_t) zend_update_property_info_ce TSRMLS_CC);
return 0;