diff options
author | nikita2206 <inefedor@gmail.com> | 2016-05-16 02:58:21 +0300 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2016-07-13 21:39:55 +0200 |
commit | eb190b4e917e537380a505c4c28b9dc2c5b3c295 (patch) | |
tree | 6ead6d22df1044fe792041a81baa804869fa4d34 /ext/reflection | |
parent | 1896ca4e88451d5190d3ce921d6f7a52b3ec6e9f (diff) | |
download | php-git-eb190b4e917e537380a505c4c28b9dc2c5b3c295.tar.gz |
fix: bug72222 for PHP-5.6 reflection export of array consts
Diffstat (limited to 'ext/reflection')
-rw-r--r-- | ext/reflection/php_reflection.c | 27 | ||||
-rw-r--r-- | ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt | 31 |
2 files changed, 47 insertions, 11 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index fbcf7a77ca..5f15287237 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -673,21 +673,26 @@ 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 TSRMLS_DC) { char *type; - zval value_copy; - int use_copy; - type = zend_zval_type_name(value); - zend_make_printable_zval(value, &value_copy, &use_copy); - if (use_copy) { - value = &value_copy; - } + if (Z_TYPE_P(value) == IS_ARRAY) { + string_printf(str, "%s Constant [ %s %s ] { Array }\n", + indent, type, name); + } else { + zval value_copy; + int use_copy; - string_printf(str, "%s Constant [ %s %s ] { %s }\n", - indent, type, name, Z_STRVAL_P(value)); + zend_make_printable_zval(value, &value_copy, &use_copy); + if (use_copy) { + value = &value_copy; + } + + string_printf(str, "%s Constant [ %s %s ] { %s }\n", + indent, type, name, Z_STRVAL_P(value)); - if (use_copy) { - zval_dtor(value); + if (use_copy) { + zval_dtor(value); + } } } /* }}} */ diff --git a/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt b/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt new file mode 100644 index 0000000000..e64dc97109 --- /dev/null +++ b/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt @@ -0,0 +1,31 @@ +--TEST-- +ReflectionClass::export() - array constants +--FILE-- +<?php +Class A { + const A = 8; + const B = ["a", "b"]; +} +ReflectionClass::export("A"); +?> +--EXPECTF-- +Class [ <user> class A ] { + @@ %s 2-5 + + - Constants [2] { + Constant [ integer A ] { 8 } + Constant [ array B ] { Array } + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [0] { + } +} |