diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-13 21:46:52 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-13 21:48:05 +0200 |
| commit | 57c998361957fec8a58b4ea6a9bc49887395db93 (patch) | |
| tree | 22247eb18647a12ec425cd1b5e3de13f08e0b36c /ext/reflection/php_reflection.c | |
| parent | 7ed028b1080c44a8de4da1d775fd8e38c6536845 (diff) | |
| parent | eb190b4e917e537380a505c4c28b9dc2c5b3c295 (diff) | |
| download | php-git-57c998361957fec8a58b4ea6a9bc49887395db93.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/reflection/php_reflection.c
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 4c3f6240f4..964e7a9e57 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -618,12 +618,16 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in static void _const_string(string *str, char *name, zval *value, char *indent) { char *type = zend_zval_type_name(value); - zend_string *value_str = zval_get_string(value); - string_printf(str, "%s Constant [ %s %s ] { %s }\n", - indent, type, name, ZSTR_VAL(value_str)); - - zend_string_release(value_str); + if (Z_TYPE_P(value) == IS_ARRAY) { + string_printf(str, "%s Constant [ %s %s ] { Array }\n", + indent, type, name); + } else { + zend_string *value_str = zval_get_string(value); + string_printf(str, "%s Constant [ %s %s ] { %s }\n", + indent, type, name, ZSTR_VAL(value_str)); + zend_string_release(value_str); + } } /* }}} */ |