Commit dab10fa
Do not narrow array to empty when
- Remove `array_find_key` from the bidirectional null narrowing in
`TypeSpecifier::resolveIdentical` that was shared with `array_key_first`
and `array_key_last`. Unlike those functions, `array_find_key` returns
null when no element matches the callback, not when the array is empty.
- Keep the one-directional narrowing: `array_find_key() !== null` still
correctly implies the array is non-empty.
- Update existing test assertions in `array-find-key-existing.php` and
`NonexistentOffsetInArrayDimFetchRuleTest` to reflect the corrected
behavior.
- Probed analogous functions (`array_search`, `array_find`,
`array_key_first`, `array_key_last`): none have the same issue.
`array_search` was never in the empty-array narrowing list.
`array_key_first`/`array_key_last` correctly imply empty array when
returning null.array_find_key() returns null1 parent 6eab97a commit dab10fa
4 files changed
Lines changed: 69 additions & 7 deletions
File tree
- src/Analyser
- tests/PHPStan
- Analyser/nsrt
- Rules/Arrays
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3139 | 3139 | | |
3140 | 3140 | | |
3141 | 3141 | | |
3142 | | - | |
3143 | 3142 | | |
3144 | 3143 | | |
3145 | 3144 | | |
3146 | | - | |
3147 | | - | |
3148 | | - | |
3149 | | - | |
| 3145 | + | |
| 3146 | + | |
| 3147 | + | |
| 3148 | + | |
| 3149 | + | |
| 3150 | + | |
| 3151 | + | |
| 3152 | + | |
| 3153 | + | |
| 3154 | + | |
| 3155 | + | |
| 3156 | + | |
| 3157 | + | |
| 3158 | + | |
3150 | 3159 | | |
3151 | 3160 | | |
3152 | 3161 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
| 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 | + | |
| 53 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1333 | 1333 | | |
1334 | 1334 | | |
1335 | 1335 | | |
1336 | | - | |
| 1336 | + | |
1337 | 1337 | | |
1338 | 1338 | | |
1339 | 1339 | | |
| |||
0 commit comments