Commit 0aeebb0
Decompose union offset types in
- In `flipArray()`, when a value type decomposes into multiple constant scalar types
(e.g. `'a'|'b'|'c'`), iterate over each scalar individually with `optional=true`
instead of passing the full union to `setOffsetValueType`. This prevents the
builder's optional-key-replacement logic from overwriting previous values and
avoids partial-match degradation to general array types.
- Apply the same decomposition in `fillKeysArray()` to fix the analogous
partial-match degradation when overlapping union value types are used as keys.
- Add `NonEmptyArrayType` wrapping in `ArrayFillKeysFunctionReturnTypeExtension`
when the input array is non-empty, mirroring the existing logic in
`ArrayFlipFunctionReturnTypeExtension`.ConstantArrayType::flipArray() and fillKeysArray() to preserve per-key value precision1 parent f830e4f commit 0aeebb0
3 files changed
Lines changed: 59 additions & 5 deletions
File tree
- src/Type
- Constant
- Php
- tests/PHPStan/Analyser/nsrt
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1493 | 1493 | | |
1494 | 1494 | | |
1495 | 1495 | | |
1496 | | - | |
| 1496 | + | |
1497 | 1497 | | |
1498 | | - | |
| 1498 | + | |
1499 | 1499 | | |
1500 | 1500 | | |
1501 | 1501 | | |
| |||
1521 | 1521 | | |
1522 | 1522 | | |
1523 | 1523 | | |
| 1524 | + | |
1524 | 1525 | | |
1525 | | - | |
| 1526 | + | |
1526 | 1527 | | |
1527 | | - | |
| 1528 | + | |
1528 | 1529 | | |
1529 | 1530 | | |
1530 | 1531 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
38 | 40 | | |
39 | 41 | | |
40 | 42 | | |
41 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
42 | 48 | | |
43 | 49 | | |
44 | 50 | | |
| 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 | + | |
0 commit comments