Fix issue 8467 intersect resolved conditional types

[rajyan]

I thought about this once in 42bddf0 but wasn't sure when this is needed.

The composer integration test failure was a very good example.
The conditional type knows $initialClone=true => $origCwd=string|null, but isset($originCwd) has already specified $originCwd=>'string' in the if ($initialClone && isset($origCwd)) truthy scope. Conditional type can be resolved in the scope too, so it overwrites the $originCwd's type as $origCwd=string|null.

Before my changes (in 1.9.2) resolving conditional types for specified types were skipped, but I think it is better to intersect, because the conditional type can be narrower than the specified type.

[rajyan]

I believe this one is not covered in createConditionalExpressions yet and not working before 1.9.2 too.
I think it might be better to solve it in a different PR

[rajyan]

The first error of larastan test failure looks like an improvement, but not sure with the second one.

[rajyan]

https://github.com/phpstan/phpstan-src/actions/runs/3635043616/jobs/6133787739

Tested in the playground and I believe both larastan test failure are improvements.
https://laravelplayground.com/#/snippets/45e88341-c412-4c26-b3eb-5956890561aa

First one
https://github.com/nunomaduro/larastan/blob/325d2f377f17d99529ea76833479e6ab6d6ff64c/tests/Type/data/collection-stubs.php#L33
we know that the items is <int, App\User>

second one
https://github.com/nunomaduro/larastan/blob/325d2f377f17d99529ea76833479e6ab6d6ff64c/tests/Type/data/collection-generic-static-methods.php#L171
the result is always an empty items because the callback is invalid, that means TKey cannot be resolved, and should be array-key (int|string).

Not sure enough with the second test. Maybe @canvural knows something?

[phpstan-bot]

This pull request has been marked as ready for review.

[rajyan]

The test is failing in #2058 too, it may have nothing to do with this change anyway.

[ondrejmirtes]

Thank you 😊

[canvural]

phpstan/phpstan-src/actions/runs/3635043616/jobs/6133787739

Tested in the playground and I believe both larastan test failure are improvements. laravelplayground.com/#/snippets/45e88341-c412-4c26-b3eb-5956890561aa

First one nunomaduro/larastan@325d2f3/tests/Type/data/collection-stubs.php#L33 we know that the items is <int, App\User>

second one nunomaduro/larastan@325d2f3/tests/Type/data/collection-generic-static-methods.php#L171 the result is always an empty items because the callback is invalid, that means TKey cannot be resolved, and should be array-key (int|string).

Not sure enough with the second test. Maybe @canvural knows something?

phpstan/phpstan-src/actions/runs/3635043616/jobs/6133787739

Tested in the playground and I believe both larastan test failure are improvements. laravelplayground.com/#/snippets/45e88341-c412-4c26-b3eb-5956890561aa

First one nunomaduro/larastan@325d2f3/tests/Type/data/collection-stubs.php#L33 we know that the items is <int, App\User>

second one nunomaduro/larastan@325d2f3/tests/Type/data/collection-generic-static-methods.php#L171 the result is always an empty items because the callback is invalid, that means TKey cannot be resolved, and should be array-key (int|string).

Not sure enough with the second test. Maybe @canvural knows something?

I think this was caused because of a change in Laravel, not by this change. Because Larastan's own CI is also failing. So I'll fix this there 👍🏽

[ondrejmirtes]

Yeah, I'll update the commit on our side once you fix it, thank you :)

[rajyan]

Thank you!

[canvural]

@ondrejmirtes larastan/larastan@1a11021 Larastan's CI is green now.

[ondrejmirtes]

PHPStan is green too 🎉 https://github.com/phpstan/phpstan/actions/runs/3649224831/jobs/6163628972