Fix trait insteadof + qualified as alias dropping winner method (#9903) - #9913
Merged
Merged
Conversation
Trait-qualified `TB::f as g` must add an alias from the losing trait without removing the merged winner `f` from `TA::f insteadof TB`. VM, JIT, and compile-time TraitComposedMethodResolver now only unset merged names for unqualified renames. Closes #9903. Co-authored-by: Cursor <cursoragent@cursor.com>
2 tasks
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
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.
Summary
TA::f insteadof TBwithTB::f as gdropped the winner methodffrom the classTrait::method as aliasnow adds an alias without unsetting the merged method under the original name (matches Zend/zend_traits.c)applyTraitUsesWithAdaptations), JIT trait flattening, and compile-timeTraitComposedMethodResolverCloses #9903
php-src reference
Zend/zend_compile.c— trait alias/precedenceZend/zend_inheritance.c— trait method compositionVerification
Output:
Made with Cursor