Repository navigation
Work out class members the way PHP links traits and inheritance - #890
Merged
Merged
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #890 +/- ##
=========================================
Coverage 99.70% 99.70%
- Complexity 1954 1969 +15
=========================================
Files 146 147 +1
Lines 4464 4479 +15
=========================================
+ Hits 4451 4466 +15
Misses 13 13 ☔ View full report in Codecov by Harness. |
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Closes #732. Closes #889. Closes #887.
When a class uses traits and also extends a parent, the server often reported different members than PHP does. For example:
PHP gives
Model::save()the concrete method fromBase. The server showed the trait's abstract declaration instead, in hover, go to definition and completion. The same family of mistakes affected trait aliases (as),insteadof, and traits that use other traits.Cause
The server worked out a class's members by collecting every declaration of a name it could reach (the class, its traits, its parents, its interfaces) and taking the nearest one, then applied
asaliases in a separate step for the class being looked up only. PHP instead builds each class's member list once, when it loads the class, in a fixed order:asandinsteadofrules applied. Abstract trait methods wait.Change
MemberResolvernow builds each class's member list in that same order and answers every lookup from it. The old search and the separate alias step are gone. Rules that differ by kind of member (method, property, constant, enum case) live inMemberKind.Visible results, each matching PHP:
asalias declared in a parent class, or inside a used trait, reaches the class (Trait member rules must match PHP #732 case 2).insteadofmatches method names regardless of case (Trait member rules must match PHP #732 case 4), and also excludes what the excluded trait got from traits it uses.tests/EndToEnd/scripts/.PHP 8.4 vs 8.5
PHP 8.5 changed when trait members are added relative to inheritance. For methods, 8.4 and 8.5 end up with the same members. For a constant or property declared identically in both a trait and a parent, they differ:
C::Xdeclared byPCC::$pdeclared byPC(new Q)->read()1Error: Cannot access protected constant C::XThis follows 8.5, which reads as a bug fix, regardless of which PHP runs the server. Test fixtures avoid that case, since CI also runs on 8.4.
Tests
MemberResolverTypeGraphTestnow checks, for every public method of every fixture class, that the server picks the same declaration PHP's reflection reports (same file, same line, same abstractness). Three new classes intests/Fixtures/src/Hierarchy/, built on the existingConflictingTraitA/B,TraitAdaptationUserandTraitAliasCollidingParent, cover the cases above; each fails against the previous resolver.MemberResolverTestcovers the constant, constructor, property, trait-cycle and visibility-only-alias cases. One existing test,testListedMethodsIncludeANamedAlias, now looks members up by name instead of by list position, since PHP adds an alias before the method it renames.MemberKindTestand the newMemberEntryTestcover the new per-kind rules.Known limits
static::foo()(orstatic::$x), code in a class still resolves to its own privatefoowhen a subclass declares a public one; PHP uses the subclass's. Telling::apart from->is Which members a member access admits must have one owner #881, so this stays as it was.__construct as init) is treated by its new name, not as a constructor.final(foo as final) does not show it (Trait aliases must carry a final modifier #891).Note for reviewers
The move of #889's test script landed in the commit titled "Wrap two long assertions" by mistake; the squash merge makes that moot.
🤖 Generated with Claude Code