mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 11:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ReflectionProperty::__toString() of properties containing enums

Browse Source 
Fix GH-8444
This commit is contained in:
Ilija Tovilo 2022-04-28 19:46:46 +02:00
parent 21d551ad0f
commit 1944c14ce7
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -141,6 +141,8 @@ PHP NEWS
- Reflection:
. Fixed bug GH-8080 (ReflectionClass::getConstants() depends on def. order).
(cmb)
. Fixed bug GH-8444 (Fix ReflectionProperty::__toString() of properties
containing instantiated enums). (ilutov)
- Zlib:
. Fixed bug GH-7953 (ob_clean() only does not set Content-Encoding). (cmb)

7
ext/reflection/php_reflection.c
View File

@ -638,6 +638,13 @@ static int format_default_value(smart_str *str, zval *value) {
format_default_value(str, zv);
} ZEND_HASH_FOREACH_END();
smart_str_appendc(str, ']');
} else if (Z_TYPE_P(value) == IS_OBJECT) {
zend_object *obj = Z_OBJ_P(value);
zend_class_entry *class = obj->ce;
ZEND_ASSERT(class->ce_flags & ZEND_ACC_ENUM);
smart_str_append(str, class->name);
smart_str_appends(str, "::");
smart_str_append(str, Z_STR_P(zend_enum_fetch_case_name(obj)));
} else {
ZEND_ASSERT(Z_TYPE_P(value) == IS_CONSTANT_AST);
zend_string *ast_str = zend_ast_export("", Z_ASTVAL_P(value), "");

31
ext/reflection/tests/gh8444.phpt Normal file
View File

@ -0,0 +1,31 @@
--TEST--
GH-8444 (Fix ReflectionProperty::__toString() of properties containing instantiated enums)
--FILE--
<?php
enum Foo
{
case Bar;
}
class Bar
{
public Foo $enum = Foo::Bar;
public $enumInArray = [Foo::Bar];
}
echo new \ReflectionProperty('Bar', 'enum'), "\n";
echo new \ReflectionProperty('Bar', 'enumInArray'), "\n";
echo new \ReflectionProperty(new Bar, 'enum'), "\n";
echo new \ReflectionProperty(new Bar, 'enumInArray'), "\n";
?>
--EXPECT--
Property [ public Foo $enum = Foo::Bar ]
Property [ public $enumInArray = [Foo::Bar] ]
Property [ public Foo $enum = Foo::Bar ]
Property [ public $enumInArray = [Foo::Bar] ]