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

ResolvedPhpDocBlock: fix parent return tag merging #2803

Merged
merged 7 commits into from Dec 8, 2023

Conversation

$parentType,
static function (Type $type, callable $traverse) use ($classReflection): Type {
if ($type instanceof StaticType) {
return $type->changeBaseClass($classReflection);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, I'd fix this the same way so 👍

I just hate adding new properties to this class but I didn't figure out a better solution. yet. Merging this.

@staabm
Copy link
Contributor

staabm commented Dec 5, 2023

it seems the change fixes more stuff, see https://github.com/phpstan/phpstan-src/actions/runs/7100699219?pr=2803

@staabm
Copy link
Contributor

staabm commented Dec 5, 2023

Regression tests for all fixed issues would be good. Sorry I did not mention it earlier

@janedbal
Copy link
Contributor Author

janedbal commented Dec 5, 2023

@staabm All those look the same. But we can add them to be sure..

@janedbal
Copy link
Contributor Author

janedbal commented Dec 5, 2023

@staabm Added

@ondrejmirtes ondrejmirtes merged commit c445490 into phpstan:1.10.x Dec 8, 2023
422 of 424 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
3 participants