Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support tagged unions in array_merge #3770

Merged
merged 1 commit into from
Jan 5, 2025

Conversation

herndlm
Copy link
Contributor

@herndlm herndlm commented Jan 4, 2025

lucky find combined with some cleanups :)

Closes phpstan/phpstan#7857
Closes phpstan/phpstan#8632
Closes phpstan/phpstan#9559

@herndlm herndlm force-pushed the array-merge-tagged-unions branch from 1ee5bfc to 8952033 Compare January 4, 2025 21:11
@staabm
Copy link
Contributor

staabm commented Jan 5, 2025

Ondrejs law strikes again: get rid of instanceof *Type will fix some bugs you didn't think are related :-)

@herndlm herndlm marked this pull request as draft January 5, 2025 09:26
@ondrejmirtes
Copy link
Member

This looks like it could be relevant on 1.12.x, can you try that? Thanks!

@herndlm herndlm force-pushed the array-merge-tagged-unions branch from 77c0c0c to ad54a20 Compare January 5, 2025 13:01
@herndlm herndlm changed the base branch from 2.1.x to 1.12.x January 5, 2025 13:19
@herndlm herndlm force-pushed the array-merge-tagged-unions branch from ad54a20 to be81e3e Compare January 5, 2025 13:19
@herndlm herndlm marked this pull request as ready for review January 5, 2025 13:19
@phpstan-bot
Copy link
Collaborator

This pull request has been marked as ready for review.

@herndlm
Copy link
Contributor Author

herndlm commented Jan 5, 2025

This looks like it could be relevant on 1.12.x, can you try that? Thanks!

done, you should be able to upmerge this just fine

@ondrejmirtes ondrejmirtes merged commit 2132cc0 into phpstan:1.12.x Jan 5, 2025
358 checks passed
@ondrejmirtes
Copy link
Member

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants