Commit 98dad9b
Intersect stored
- When a FuncCall expression (e.g. `count($arr)`) has a stored expression
type from a prior condition, `resolveType()` now also computes the
dynamic type via the ExprHandler and returns the intersection of both.
- This prevents stale stored types from overriding the correct type when
function arguments have been narrowed after scope merging.
- The bug occurred when `count($arr)` was used in a comparison (e.g.
`count($arr) > 2`), storing `count($arr) = int<0, max>` after merge,
and then `$arr` was narrowed to non-empty by a different condition.
- The fix also covers analogous cases: `sizeof()`, `strlen()`,
`mb_strlen()`, and any other FuncCall with stored expression types.FuncCall expression types with dynamically computed types in MutatingScope::resolveType()
1 parent 03834ec commit 98dad9b
File tree
2 files changed
+71
-1
lines changed- src/Analyser
- tests/PHPStan/Analyser/nsrt
2 files changed
+71
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
973 | 973 | | |
974 | 974 | | |
975 | 975 | | |
976 | | - | |
| 976 | + | |
| 977 | + | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
977 | 995 | | |
978 | 996 | | |
979 | 997 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
0 commit comments