Fix stub @param types not applied inside method bodies (regression since 2.1.38)#5007
Closed
mglaman wants to merge 3613 commits intophpstan:1.11.xfrom
Closed
Fix stub @param types not applied inside method bodies (regression since 2.1.38)#5007mglaman wants to merge 3613 commits intophpstan:1.11.xfrom
mglaman wants to merge 3613 commits intophpstan:1.11.xfrom
Conversation
Difference in days might behave differently when the DateInterval is created from scratch or from a diff. Filter returned type information for DateInterval::format. It can only be non-falsy for sure if it's not '%a'.
allows re-use of version-string into PhpVersion parsing
…hpstan#4983) Co-authored-by: phpstan-bot <79867460+phpstan-bot@users.noreply.github.com> Co-authored-by: phpstan-bot <ondrej+phpstanbot@mirtes.cz>
Co-authored-by: phpstan-bot <79867460+phpstan-bot@users.noreply.github.com> Co-authored-by: phpstan-bot <ondrej+phpstanbot@mirtes.cz>
…esolvable (phpstan#4997) Co-authored-by: phpstan-bot <79867460+phpstan-bot@users.noreply.github.com>
When a PR was created by @phpstan-bot, the changelog would previously thank the bot. Instead, fetch the PR's reviews via the GitHub API and thank the people who actually reviewed the PR, excluding the maintainer and the bot itself. Supports thanking multiple reviewers. https://claude.ai/code/session_01AAuDLXqrwvhNzwseRW7Wko
NodeScopeResolver::getPhpDocs() was only consulting FileTypeMapper (the source file's phpDoc) when resolving parameter types inside method bodies, never checking StubPhpDocProvider for stub overrides. This was a regression introduced in 2.1.38 by PR phpstan#4829, which rewrote PhpDocInheritanceResolver::resolvePhpDocForMethod() and removed the PhpDocBlock::docBlockToResolvedDocBlock() helper that previously called StubPhpDocProvider::findMethodPhpDoc() first. The fix mirrors the pre-regression behaviour: consult StubPhpDocProvider before falling back to FileTypeMapper in the ClassMethod phpDoc resolution path of getPhpDocs(). Fixes phpstan/phpstan#14118 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Collaborator
|
You've opened the pull request against the latest branch 2.2.x. PHPStan 2.2 is not going to be released for months. If your code is relevant on 2.1.x and you want it to be released sooner, please rebase your pull request and change its target to 2.1.x. |
Contributor
Author
|
Superseded by #5008 which targets 1.11.x (2.1.x releases) per bot feedback. |
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
20 participants
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
NodeScopeResolver::getPhpDocs()to consultStubPhpDocProviderbefore falling back toFileTypeMapperwhen resolving parameter types inside method bodiesStubPhpDocProvideras a constructor parameter toNodeScopeResolverNodeScopeResolverconstructor call sites in test infrastructure to include the new parameterProblem
Since 2.1.38 (PR #4829 — "Rework phpDoc inheritance to resolve through reflection instead of re-walking the hierarchy"), stub
@paramtype overrides were silently ignored inside method bodies. External callers of a stubbed method still saw the correct stub types, but the method's own body would use the source file's@paramtype instead.Root cause: The removed
PhpDocBlock::docBlockToResolvedDocBlock()helper previously calledStubPhpDocProvider::findMethodPhpDoc()first and fell back toFileTypeMapperonly if no stub was found. The rewritten path ingetPhpDocs()only consultedFileTypeMapper, never checking stubs.Fixes phpstan/phpstan#14118
Test plan
StubMethodBodyTypesTestverifies stub@param callable-stringoverrides source@param stringinside the method body@return non-empty-string🤖 Generated with Claude Code