archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve error message when overriding untyped property with typed property (GH-16866)

Browse source
This commit is contained in:
chx 2024-11-20 11:59:29 +01:00 • committed by GitHub
parent 4b211a7769
commit e5c2bc41ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/tests/type_declarations/mixed/inheritance/mixed_property_inheritance_error7.phpt
View file

@ -15,4 +15,4 @@ class Bar extends Foo
?> ?>
--EXPECTF-- --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
Zend/tests/type_declarations/typed_properties_035.phpt
View file

@ -11,4 +11,4 @@ class Baz extends Foo{
} }
?> ?>
--EXPECTF-- --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
Zend/zend_inheritance.c
View file

@ -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))) { } else if (UNEXPECTED(ZEND_TYPE_IS_SET(child_info->type) && !ZEND_TYPE_IS_SET(parent_info->type))) {
zend_error_noreturn(E_COMPILE_ERROR, 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(ce->name),
ZSTR_VAL(key), ZSTR_VAL(key),
ZSTR_VAL(parent_info->ce->name)); ZSTR_VAL(parent_info->ce->name));