Commit 2b1c7b1
committed
Fix phpstan/phpstan#14413: Preserve generic type parameters when narrowing via ::class comparison
- Added determineExactClassType() helper in TypeSpecifier that intersects the
current scope type with a plain ObjectType to extract generic parameters
- When generics are found (narrowed type is more specific than plain ObjectType),
uses the narrowed type; otherwise falls back to ObjectType with asFinal()
- Updated all 3 ::class/get_class narrowing sites to use the new helper
- New regression test in tests/PHPStan/Analyser/nsrt/bug-14413.php1 parent b70fb0f commit 2b1c7b1
2 files changed
Lines changed: 95 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2844 | 2844 | | |
2845 | 2845 | | |
2846 | 2846 | | |
2847 | | - | |
| 2847 | + | |
2848 | 2848 | | |
2849 | 2849 | | |
2850 | 2850 | | |
| |||
2969 | 2969 | | |
2970 | 2970 | | |
2971 | 2971 | | |
2972 | | - | |
| 2972 | + | |
2973 | 2973 | | |
2974 | 2974 | | |
2975 | 2975 | | |
| |||
3000 | 3000 | | |
3001 | 3001 | | |
3002 | 3002 | | |
3003 | | - | |
| 3003 | + | |
3004 | 3004 | | |
3005 | 3005 | | |
3006 | 3006 | | |
| |||
3123 | 3123 | | |
3124 | 3124 | | |
3125 | 3125 | | |
| 3126 | + | |
| 3127 | + | |
| 3128 | + | |
| 3129 | + | |
| 3130 | + | |
| 3131 | + | |
| 3132 | + | |
| 3133 | + | |
| 3134 | + | |
| 3135 | + | |
| 3136 | + | |
| 3137 | + | |
| 3138 | + | |
| 3139 | + | |
| 3140 | + | |
| 3141 | + | |
3126 | 3142 | | |
| 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 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
0 commit comments