Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ext/reflection/php_reflection.c
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,9 @@ static void _enum_case_string(smart_str *str, const zend_string *name, zend_clas
}

if (c->doc_comment) {
smart_str_append_printf(str, "%s%s\n", indent, ZSTR_VAL(c->doc_comment));
smart_str_appends(str, indent);
smart_str_append(str, c->doc_comment);
smart_str_appendc(str, '\n');
}
smart_str_append_printf(str, "%sCase %s", indent, ZSTR_VAL(name));
if (c->ce->enum_backing_type == IS_UNDEF) {
Expand All @@ -691,7 +693,9 @@ static void _enum_case_string(smart_str *str, const zend_string *name, zend_clas
zval *enum_val = zend_enum_fetch_case_value(Z_OBJ(c->value));
zend_string *tmp_value_str;
zend_string *value_str = zval_get_tmp_string(enum_val, &tmp_value_str);
smart_str_append_printf(str, " = %s\n", ZSTR_VAL(value_str));
smart_str_appends(str, " = ");
smart_str_append(str, value_str);
smart_str_appendc(str, '\n');
zend_tmp_string_release(tmp_value_str);
}
}
Expand Down
61 changes: 61 additions & 0 deletions ext/reflection/tests/gh22681/ReflectionEnum_backed_value.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
--TEST--
GH-22681: null bytes in backed value truncate ReflectionEnum::__toString()
--FILE--
<?php

enum Demo: string {
case DEMO = "F\0oo";
}

$r = new ReflectionEnum(Demo::class);
echo $r;
var_dump( new ReflectionEnumBackedCase(Demo::class, 'DEMO')->getBackingValue() );
?>
--EXPECTF--
Enum [ <user> enum Demo: string implements UnitEnum, BackedEnum ] {
@@ %s %d-%d

- Enum cases [1] {
Case DEMO = F%0oo
}

- Constants [0] {
}

- Static properties [0] {
}

- Static methods [3] {
Method [ <internal, prototype UnitEnum> static public method cases ] {

- Parameters [0] {
}
- Return [ array ]
}

Method [ <internal, prototype BackedEnum> static public method from ] {

- Parameters [1] {
Parameter #0 [ <required> string|int $value ]
}
- Return [ static ]
}

Method [ <internal, prototype BackedEnum> static public method tryFrom ] {

- Parameters [1] {
Parameter #0 [ <required> string|int $value ]
}
- Return [ ?static ]
}
}

- Properties [2] {
Property [ public protected(set) readonly string $name ]
Property [ public protected(set) readonly string $value ]
}

- Methods [0] {
}
}
string(4) "F%0oo"
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Enum [ <user> enum Demo implements UnitEnum ] {
@@ %s(%d) : eval()'d code %d-%d

- Enum cases [1] {
/** F
/** F%0oo */
Case C
}

Expand Down
Loading