Commit 32c94b9
Do not create conditional expressions for non-Variable expressions absent from the other branch
- In `MutatingScope::createConditionalExpressions()`, skip creating a
conditional expression when the target expression (e.g. an array dim
fetch like `$R['aa']`) is not tracked in the other branch, the
expression is not a Variable, and the guard type overlaps with the
other branch's guard type.
- This prevents incorrect type narrowing where an array dim fetch or
property fetch from an `elseif` condition leaks into a subsequent
`if` block that checks a variable set in multiple branches.
- The Variable exception preserves the existing behavior for variable
certainty tracking (e.g. a variable defined in only one branch
correctly gets Yes certainty via conditional expressions).
- Tested with array dim fetch, nested array dim fetch, property fetch,
and multiple elseif variants.1 parent 04a99c1 commit 32c94b9
File tree
4 files changed
+107
-0
lines changed- src/Analyser
- tests/PHPStan
- Analyser/nsrt
- Rules/Comparison
- data
4 files changed
+107
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3649 | 3649 | | |
3650 | 3650 | | |
3651 | 3651 | | |
| 3652 | + | |
| 3653 | + | |
| 3654 | + | |
| 3655 | + | |
| 3656 | + | |
| 3657 | + | |
| 3658 | + | |
| 3659 | + | |
| 3660 | + | |
3652 | 3661 | | |
3653 | 3662 | | |
3654 | 3663 | | |
| |||
| 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 | + | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
239 | 245 | | |
| 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 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
0 commit comments