fix(PEAR.FunctionCallSignature): avoid reindenting heredoc/nowdoc blocks#1417
Open
hakonharnes wants to merge 1 commit intoPHPCSStandards:4.xfrom
Open
Conversation
c114f93 to
0a45e22
Compare
0a45e22 to
64b39b1
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes a bug in
PEAR.Functions.FunctionCallSignaturewherephpcbfcan produce syntactically invalid PHP when fixing multiline function calls containing flexible heredoc/nowdoc strings.In affected cases, the sniff could adjust indentation across a heredoc/nowdoc scope and rewrite the closer indentation independently from the body indentation, resulting in mixed indentation and parse errors.
Changes made:
In
PEAR.Functions.FunctionCallSignature:T_END_HEREDOC/T_END_NOWDOC.changeCodeBlockIndent()when the related scope opener isT_START_HEREDOC/T_START_NOWDOC.Regression coverage:
src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.incsrc/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixedsrc/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.phpManual verification used during development:
Before this fix, the final lint can fail with mixed-indentation parse errors. After this fix, lint remains clean.
Suggested changelog entry
Fixed
PEAR.Functions.FunctionCallSignaturesophpcbfno longer corrupts indentation for flexible heredoc/nowdoc content in multiline function calls.Types of changes
PR checklist