Fix @phpstan-assert not working correctly with union types#4920
Merged
staabm merged 8 commits intophpstan:2.1.xfrom Feb 15, 2026
Merged
Fix @phpstan-assert not working correctly with union types#4920staabm merged 8 commits intophpstan:2.1.xfrom
@phpstan-assert not working correctly with union types#4920staabm merged 8 commits intophpstan:2.1.xfrom
Conversation
Collaborator
|
This pull request has been marked as ready for review. |
VincentLanglet
approved these changes
Feb 13, 2026
staabm
changed the title
@phpstan-assert not working correctly with union types
- UnionTypeMethodReflection::getAsserts() was using intersectWith() which concatenates assert tags, causing specifyTypesFromAsserts to intersect the asserted types (string & int = never) instead of unioning them - Added Assertions::unionWith() that groups assertions by parameter identity and unions their types via TypeCombinator::union() - Changed UnionTypeMethodReflection to use unionWith() instead of intersectWith() - Assertions without a matching counterpart in the other union member are dropped - New regression test in tests/PHPStan/Analyser/nsrt/bug-14108.php
ondrejmirtes
pushed a commit
that referenced
this pull request
Feb 15, 2026
Previously, getSelfOutType(), getAttributes(), and getResolvedPhpDoc()
on Union/IntersectionType{Method,Property}Reflection only used the first
member ($this->methods[0] / $this->properties[0]), losing information
from other members. This applies the same merging pattern from PR #4920
(which fixed assertion merging) to these other metadata methods:
- getSelfOutType(): Union self-out types for union types, intersect for
intersection types. Returns null if any member lacks a self-out type.
- getAttributes(): For union types, only keep attributes present in ALL
members (intersection semantics). For intersection types, collect
attributes from ANY member (union semantics), deduplicating by name.
- getResolvedPhpDoc(): Return null instead of arbitrarily returning the
first member's PHPDoc block, which could be misleading.
https://claude.ai/code/session_01KdvoAVF2YDBnuJ3gmgU9hQ
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
3 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.
Fixes phpstan/phpstan#14108
Closes #4916 (files)