[RFC] Extend #[\Override] to target properties #19061
Open
+446
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TimWolla
reviewed
Jul 7, 2025
Comment on lines
+6
to
+7
| class C | ||
| { |
There was a problem hiding this comment.
Suggested change
| class C | |
| { | |
| class C { |
to match the other tests
| @@ -0,0 +1,19 @@ | |||
| --TEST-- | |||
| #[\Override]: Properties: On used trait without parent method. | |||
There was a problem hiding this comment.
Suggested change
| #[\Override]: Properties: On used trait without parent method. | |
| #[\Override]: Properties: On used trait without parent property. |
| @@ -0,0 +1,23 @@ | |||
| --TEST-- | |||
| #[\Override]: Properties: On used trait with interface method. | |||
There was a problem hiding this comment.
Suggested change
| #[\Override]: Properties: On used trait with interface method. | |
| #[\Override]: Properties: On used trait with interface property. |
| @@ -0,0 +1,19 @@ | |||
| --TEST-- | |||
| #[\Override]: Properties: Parent property is private (2). | |||
There was a problem hiding this comment.
For the tests where this is a (2) version, I suggest identifying what the difference is, e.g.
#[\Override]: Property: Parent property is private (child property public)
#[\Override]: Property: Parent property is private (child property private)
| @@ -7881,6 +7881,11 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32 | |||
| zend_compile_attributes( | |||
| &prop->attributes, attributes_ast, 0, ZEND_ATTRIBUTE_TARGET_PROPERTY, ZEND_ATTRIBUTE_TARGET_PARAMETER); | |||
| } | |||
|
|
|||
| zend_attribute *override_attribute = zend_get_attribute_str(prop->attributes, "override", sizeof("override")-1); | |||
There was a problem hiding this comment.
Checking for the override attribute should only be needed if the property has any attributes, i.e. this can be moved into the if (attributes_ast) { conditional block
| @@ -8859,6 +8864,11 @@ static void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t f | |||
| zend_compile_attributes(&info->attributes, attr_ast, 0, ZEND_ATTRIBUTE_TARGET_PROPERTY, 0); | |||
| } | |||
|
|
|||
| zend_attribute *override_attribute = zend_get_attribute_str(info->attributes, "override", sizeof("override")-1); | |||
There was a problem hiding this comment.
same as above, check is only needed if the attr_ast check passes
TimWolla
reviewed
Jul 27, 2025
Comment on lines
+1570
to
+1572
| if (child_info->flags & ZEND_ACC_OVERRIDE) { | ||
| child_info->flags &= ~ZEND_ACC_OVERRIDE; | ||
| } |
There was a problem hiding this comment.
This can just unconditionally try to remove the flag:
Suggested change
| if (child_info->flags & ZEND_ACC_OVERRIDE) { | |
| child_info->flags &= ~ZEND_ACC_OVERRIDE; | |
| } | |
| child_info->flags &= ~ZEND_ACC_OVERRIDE; |
Comment on lines
+2328
to
+2335
| ZEND_HASH_MAP_FOREACH_PTR(&ce->properties_info, p) { | ||
| if (p->flags & ZEND_ACC_OVERRIDE) { | ||
| zend_error_noreturn( | ||
| E_COMPILE_ERROR, | ||
| "%s::$%s has #[\\Override] attribute, but no matching parent property exists", | ||
| ZSTR_VAL(ce->name), zend_get_unmangled_property_name(p->name)); | ||
| } | ||
| } ZEND_HASH_FOREACH_END(); |
There was a problem hiding this comment.
This can probably merged with the loop below (by removing the ce->num_hooked_props check).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://wiki.php.net/rfc/override_properties