Commit a5cd85b
committed
Fix count()-based type narrowing on unions of constant array shapes
When narrowing a union of constant array shapes (e.g.
`array{bool}|array{mixed, string|null, mixed}`) via count() comparisons,
the narrowed type was applied via intersection with the original type.
This failed to filter out non-matching union members because
ConstantArrayType::isSuperTypeOf() uses open-shape semantics.
Fix: use setAlwaysOverwriteTypes() when the type being narrowed is a
constant array union, so the precisely-computed result from
specifyTypesForCountFuncCall() directly replaces the original type
instead of being intersected with it.
This also improves precision for arrays with optional keys: when
count === N is known, optional keys that can't be present at that
count are now correctly removed from the narrowed type.
Closes phpstan/phpstan#143011 parent 98a3159 commit a5cd85b
4 files changed
Lines changed: 56 additions & 3 deletions
File tree
- src/Analyser
- tests/PHPStan/Analyser/nsrt
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2586 | 2586 | | |
2587 | 2587 | | |
2588 | 2588 | | |
| 2589 | + | |
| 2590 | + | |
| 2591 | + | |
2589 | 2592 | | |
2590 | 2593 | | |
2591 | 2594 | | |
| |||
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
291 | 291 | | |
292 | 292 | | |
293 | 293 | | |
294 | | - | |
| 294 | + | |
295 | 295 | | |
296 | 296 | | |
297 | 297 | | |
298 | 298 | | |
299 | 299 | | |
300 | 300 | | |
301 | 301 | | |
302 | | - | |
| 302 | + | |
303 | 303 | | |
304 | 304 | | |
305 | 305 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
| |||
0 commit comments