diff options
author | Felipe Pena <felipe@php.net> | 2010-05-26 00:00:58 +0000 |
---|---|---|
committer | Felipe Pena <felipe@php.net> | 2010-05-26 00:00:58 +0000 |
commit | c4be9c3890f6295ff6b18f4f3f6a04197c24fe25 (patch) | |
tree | 33e0fe7e992f9ae38b49018b20711ebd01022e0e /Zend/zend_execute_API.c | |
parent | 58f13c3c9f25b36cedcdf48c15dd8cabec7985b0 (diff) | |
download | php-git-c4be9c3890f6295ff6b18f4f3f6a04197c24fe25.tar.gz |
- Fixed bug #51905 (ReflectionParameter fails if default value is an array with an access to self::)
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r-- | Zend/zend_execute_API.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 1865b6cbf9..56aee7bf6e 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -684,13 +684,25 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco } zval_dtor(&const_value); } - zend_hash_apply_with_argument(Z_ARRVAL_P(p), (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC); + zend_hash_apply_with_argument(Z_ARRVAL_P(p), (apply_func_arg_t) zval_update_constant_inline_change, (void *) scope TSRMLS_CC); zend_hash_internal_pointer_reset(Z_ARRVAL_P(p)); } return 0; } /* }}} */ +ZEND_API int zval_update_constant_inline_change(zval **pp, void *scope TSRMLS_DC) /* {{{ */ +{ + return zval_update_constant_ex(pp, (void*)1, scope TSRMLS_CC); +} +/* }}} */ + +ZEND_API int zval_update_constant_no_inline_change(zval **pp, void *scope TSRMLS_DC) /* {{{ */ +{ + return zval_update_constant_ex(pp, (void*)0, scope TSRMLS_CC); +} +/* }}} */ + ZEND_API int zval_update_constant(zval **pp, void *arg TSRMLS_DC) /* {{{ */ { return zval_update_constant_ex(pp, arg, NULL TSRMLS_CC); |