Skip to content

Improve error message when overriding untyped property with typed property #16866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 20, 2024
Merged

Improve error message when overriding untyped property with typed property #16866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8012fe
Make error message clearer in zend_inheritance.c
chx Nov 19, 2024
f169f4f
Update zend_inheritance.c
chx Nov 19, 2024
4445064
Update zend_inheritance.c
chx Nov 19, 2024
9a77080
Apply suggestions from code review
chx Nov 19, 2024
2fbea39
Update typed_properties_035.phpt
chx Nov 19, 2024
085e17d
Update mixed_property_inheritance_error7.phpt
chx Nov 19, 2024
fe0941c
Fix expectation in mixed_property_inheritance_error7.phpt
TimWolla Nov 20, 2024
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
2 changes: 1 addition & 1 deletion Zend/tests/type_declarations/mixed/inheritance/mixed_property_inheritance_error7.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ class Bar extends Foo

?>
--EXPECTF--
Fatal error: Type of Bar::$property1 must not be defined (as in class Foo) in %s on line %d
Fatal error: Type of Bar::$property1 must be omitted to match the parent definition in class Foo in %s on line %d
2 changes: 1 addition & 1 deletion Zend/tests/type_declarations/typed_properties_035.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ class Baz extends Foo{
}
?>
--EXPECTF--
Fatal error: Type of Baz::$bar must not be defined (as in class Foo) in %s on line 6
Fatal error: Type of Baz::$bar must be omitted to match the parent definition in class Foo in %s on line 6
2 changes: 1 addition & 1 deletion Zend/zend_inheritance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ static void do_inherit_property(zend_property_info *parent_info, zend_string *ke
}
} else if (UNEXPECTED(ZEND_TYPE_IS_SET(child_info->type) && !ZEND_TYPE_IS_SET(parent_info->type))) {
zend_error_noreturn(E_COMPILE_ERROR,
"Type of %s::$%s must not be defined (as in class %s)",
"Type of %s::$%s must be omitted to match the parent definition in class %s",
ZSTR_VAL(ce->name),
ZSTR_VAL(key),
ZSTR_VAL(parent_info->ce->name));
Expand Down
Loading