Apply suggestions from code review

chx · iluuu1994 · web-flow · commit 9a770800d0a6 · 2024-11-19T23:03:39.000+01:00
Co-authored-by: Ilija Tovilo &lt;ilija.tovilo@me.com&gt;
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -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 (it must match the definition 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));

Original file line number	Diff line number	Diff line change
`@@ -1507,7 +1507,7 @@ static void do_inherit_property(zend_property_info parent_info, zend_string ke`
`1507`	`1507`	`}`
`1508`	`1508`	`} else if (UNEXPECTED(ZEND_TYPE_IS_SET(child_info->type) && !ZEND_TYPE_IS_SET(parent_info->type))) {`
`1509`	`1509`	`zend_error_noreturn(E_COMPILE_ERROR,`
`1510`		`- "Type of %s::$%s must not be defined (it must match the definition in class %s)",`
	`1510`	`+ "Type of %s::$%s must be omitted to match the parent definition in class %s",`
`1511`	`1511`	`ZSTR_VAL(ce->name),`
`1512`	`1512`	`ZSTR_VAL(key),`
`1513`	`1513`	`ZSTR_VAL(parent_info->ce->name));`