Commit c4a3c75
Fix incorrect narrowing of nested array dim fetch after assignment in loop
When a constant array shape (e.g. array{-1: 0, 0: 0, 2: 0, 1: 0}) was
assigned to a nested property dim fetch like $this->prop[$key], and then
an inner loop modified it via ++$this->prop[$key][$offset], the constant
shape was lost during loop processing. This caused false positive
"Offset might not exist" errors even though all offsets were explicitly
set.
Two changes fix this:
1. In AssignHandler's descending phase, when the scope tracks a more
precise type for an intermediate dim fetch and that type has all the
offsets needed by the next level, use the scope's tracked type instead
of recomputing from the parent's general array type.
2. In MutatingScope::generalizeVariableTypeHolders, when a parent
expression is generalized and both scopes track a child expression as
constant arrays with matching keys, generalize the child instead of
invalidating it. This preserves the constant array shape through loop
generalization.
Fixes phpstan/phpstan#136691 parent c009cb0 commit c4a3c75
4 files changed
Lines changed: 76 additions & 2 deletions
File tree
- src/Analyser
- ExprHandler
- tests/PHPStan/Rules/Arrays
- data
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
948 | 948 | | |
949 | 949 | | |
950 | 950 | | |
951 | | - | |
| 951 | + | |
| 952 | + | |
952 | 953 | | |
953 | 954 | | |
954 | 955 | | |
| |||
959 | 960 | | |
960 | 961 | | |
961 | 962 | | |
962 | | - | |
| 963 | + | |
| 964 | + | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
963 | 970 | | |
964 | 971 | | |
965 | 972 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3852 | 3852 | | |
3853 | 3853 | | |
3854 | 3854 | | |
| 3855 | + | |
| 3856 | + | |
| 3857 | + | |
| 3858 | + | |
| 3859 | + | |
| 3860 | + | |
| 3861 | + | |
| 3862 | + | |
| 3863 | + | |
| 3864 | + | |
| 3865 | + | |
| 3866 | + | |
3855 | 3867 | | |
3856 | 3868 | | |
3857 | 3869 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1263 | 1263 | | |
1264 | 1264 | | |
1265 | 1265 | | |
| 1266 | + | |
| 1267 | + | |
| 1268 | + | |
| 1269 | + | |
| 1270 | + | |
| 1271 | + | |
| 1272 | + | |
1266 | 1273 | | |
| 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 | + | |
0 commit comments