Skip to content

Commit 90802ec

Browse files
committed
Adjust enum conflict wording
1 parent 4d1f286 commit 90802ec

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Zend/tests/enum/gh21760.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ enum Direction {
1616

1717
?>
1818
--EXPECTF--
19-
Fatal error: Cannot use trait X, because constant Up conflicts with enum case Direction::Up in %s on line %d
19+
Fatal error: Cannot use trait X, because X::Up conflicts with enum case Direction::Up in %s on line %d

Zend/zend_inheritance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2761,7 +2761,7 @@ static void emit_trait_constant_enum_case_conflict_error(
27612761
const zend_class_entry *ce, const zend_class_constant *trait_constant, zend_string *name
27622762
) {
27632763
zend_error_noreturn(E_COMPILE_ERROR,
2764-
"Cannot use trait %s, because constant %s conflicts with enum case %s::%s",
2764+
"Cannot use trait %s, because %s::%s conflicts with enum case %s::%s",
27652765
ZSTR_VAL(trait_constant->ce->name),
27662766
ZSTR_VAL(name),
27672767
ZSTR_VAL(ce->name),

0 commit comments

Comments
 (0)