Repository navigation
Commit df57b6c
committed
Narrow a class-string with call-site variance by its class name
A class name compared with a class-string of its own generic class now
takes the type arguments and the call-site variance of that class-string as
they are written: `X::class` read against `class-string<X<*>>` is `X<*>`.
So `$class !== X::class` narrows `class-string<X<*>>|class-string<Y<*>>` to
`class-string<Y<*>>`. Before, a class-string with call-site variance left
the class name bare, which is only maybe an `X<*>`, and nothing narrowed.
A subclass still stays bare when the class-string has call-site variance.1 parent 98c9c52 commit df57b6c
3 files changed
Lines changed: 90 additions & 11 deletions
File tree
- src/Type/Generic
- tests/PHPStan/Analyser/nsrt
- turbo-ext/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
464 | 464 | | |
465 | 465 | | |
466 | 466 | | |
467 | | - | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
468 | 470 | | |
469 | 471 | | |
470 | | - | |
471 | | - | |
472 | | - | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
473 | 476 | | |
474 | 477 | | |
475 | 478 | | |
476 | 479 | | |
477 | 480 | | |
478 | 481 | | |
479 | 482 | | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
480 | 493 | | |
481 | 494 | | |
482 | 495 | | |
| |||
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
798 | 798 | | |
799 | 799 | | |
800 | 800 | | |
801 | | - | |
| 801 | + | |
| 802 | + | |
| 803 | + | |
802 | 804 | | |
803 | 805 | | |
804 | | - | |
805 | | - | |
806 | | - | |
807 | | - | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
808 | 811 | | |
809 | 812 | | |
810 | 813 | | |
| |||
813 | 816 | | |
814 | 817 | | |
815 | 818 | | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
816 | 825 | | |
817 | 826 | | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
818 | 836 | | |
819 | 837 | | |
820 | 838 | | |
| |||
857 | 875 | | |
858 | 876 | | |
859 | 877 | | |
860 | | - | |
861 | | - | |
862 | 878 | | |
863 | 879 | | |
864 | 880 | | |
| |||
0 commit comments