Skip to content

Fix IntegrationPrinterWithPhpParserTest#255

Merged
ondrejmirtes merged 5 commits into
phpstan:2.0.xfrom
staabm:fix-test
Oct 9, 2024
Merged

Fix IntegrationPrinterWithPhpParserTest#255
ondrejmirtes merged 5 commits into
phpstan:2.0.xfrom
staabm:fix-test

Conversation

@staabm

@staabm staabm commented Oct 9, 2024

Copy link
Copy Markdown
Contributor

since PHPParser 5.3 this integration test fails.

it overlapps with a upstream implemenation of indentation-printing which was added with nikic/PHP-Parser@e50c67b

the PR removes the phpdoc-parser custom build indentation printer and re-uses the upstream indentation printer instead.

@staabm
staabm marked this pull request as ready for review October 9, 2024 08:33
@staabm

staabm commented Oct 9, 2024

Copy link
Copy Markdown
Contributor Author

on my windows box for some reason I cannot fix CS here (creates a lot of unrelated changes).
@ondrejmirtes would be great you could fix cs/phpstan-baseline, in case the fix itself works for you

$this->indentSize = $size;

return NodeTraverser::STOP_TRAVERSAL;
return NodeVisitor::STOP_TRAVERSAL;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

drive-by deprecation fix

@staabm

staabm commented Oct 9, 2024

Copy link
Copy Markdown
Contributor Author

in case we agree on this one, I can have a look at simple-downgrader 2.x

@ondrejmirtes
ondrejmirtes merged commit a131a15 into phpstan:2.0.x Oct 9, 2024
@ondrejmirtes

Copy link
Copy Markdown
Member

Awesome, thank you!

I can have a look at simple-downgrader 2.x

Yes please :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants