Skip to content

Commit 02d3eec

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Improve invalid cpp modifier message
2 parents 5c3a6ea + 011071a commit 02d3eec

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Zend/tests/ctor_promotion_additional_modifiers.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class Test {
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot use the static modifier on a promoted property in %s on line %d
12+
Fatal error: Cannot use the static modifier on a parameter in %s on line %d

Zend/tests/type_declarations/static_type_param.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ class Test {
1212

1313
?>
1414
--EXPECTF--
15-
Fatal error: Cannot use the static modifier on a promoted property in %s on line %d
15+
Fatal error: Cannot use the static modifier on a parameter in %s on line %d

Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t token
869869
} else if (target == ZEND_MODIFIER_TARGET_CONSTANT) {
870870
member = "class constant";
871871
} else if (target == ZEND_MODIFIER_TARGET_CPP) {
872-
member = "promoted property";
872+
member = "parameter";
873873
} else {
874874
ZEND_UNREACHABLE();
875875
}

0 commit comments

Comments
 (0)