Commit a01670e
committed
Extract
Replaces the duplicate `TypeTraverser::map` callback in
`TypeSpecifier::specifyTypesInCondition()` (the
`instanceof <expr>` branch) and the `InstanceOfClassTypeTraverser`
helper used by `InstanceofHandler` with one polymorphic `Type`
method. Both sites needed an out-of-band by-ref `$uncertainty` flag
to carry "we kept this symbolically, don't decide yes/no
definitively"; the new method returns a small `ClassNameToObjectTypeResult`
value object (`Type $type, bool $uncertainty`) so each leaf can carry
its own answer through composite-type distribution.
Per leaf:
- `ObjectType` and `ObjectTypeTrait` users (and `ClosureType`,
`NonexistentParentClassType`, `StaticType`): keep `$this` as the
comparison target and mark uncertain — the runtime class is only
known when `instanceof` actually executes.
- `GenericClassStringType`: project to `getGenericType()` and mark
uncertain (the class name is symbolic).
- `ConstantStringType`: collapse to `new ObjectType($value)` with no
uncertainty (the class name is concrete).
- All other non-objects (via `NonObjectTypeTrait`,
`MaybeObjectTypeTrait`): `MixedType`, no uncertainty (matches the
original `return new MixedType()` fallback).
- `MixedType` / `StrictMixedType`: same `MixedType` fallback.
- `NeverType`: pass through.
- `UnionType`/`IntersectionType`: distribute, OR-folding the
uncertainty across members (matches the original closure-captured
behavior).
- `LateResolvableTypeTrait`: delegate to `resolve()`.
`InstanceOfClassTypeTraverser` is removed (no longer used).
Pure refactor: full test suite + phpstan + cs pass.Type::toObjectTypeForInstanceofCheck() for instanceof RHS1 parent 8fafec7 commit a01670e
20 files changed
Lines changed: 155 additions & 70 deletions
File tree
- src
- Analyser
- ExprHandler
- Traverser
- Type
- Constant
- Generic
- Traits
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | 15 | | |
17 | 16 | | |
18 | 17 | | |
| |||
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
24 | | - | |
25 | 23 | | |
26 | 24 | | |
27 | 25 | | |
| |||
94 | 92 | | |
95 | 93 | | |
96 | 94 | | |
97 | | - | |
98 | | - | |
99 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
100 | 98 | | |
101 | 99 | | |
102 | 100 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
186 | 171 | | |
187 | 172 | | |
188 | 173 | | |
| |||
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
526 | 526 | | |
527 | 527 | | |
528 | 528 | | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
529 | 534 | | |
530 | 535 | | |
531 | 536 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
293 | 294 | | |
294 | 295 | | |
295 | 296 | | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
296 | 302 | | |
297 | 303 | | |
298 | 304 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
48 | 58 | | |
49 | 59 | | |
50 | 60 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1427 | 1427 | | |
1428 | 1428 | | |
1429 | 1429 | | |
| 1430 | + | |
| 1431 | + | |
| 1432 | + | |
| 1433 | + | |
| 1434 | + | |
| 1435 | + | |
| 1436 | + | |
| 1437 | + | |
| 1438 | + | |
| 1439 | + | |
| 1440 | + | |
| 1441 | + | |
| 1442 | + | |
| 1443 | + | |
| 1444 | + | |
| 1445 | + | |
| 1446 | + | |
1430 | 1447 | | |
1431 | 1448 | | |
1432 | 1449 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
642 | 642 | | |
643 | 643 | | |
644 | 644 | | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
645 | 650 | | |
646 | 651 | | |
647 | 652 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
450 | 450 | | |
451 | 451 | | |
452 | 452 | | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
453 | 458 | | |
454 | 459 | | |
455 | 460 | | |
| |||
0 commit comments