Improve support for arrow functions / sync with phpcs 3.5.5/6#143
Merged
jrfnl merged 3 commits intoJun 5, 2020
Merged
Conversation
… function argument Allow for arrow functions being used as function argument as per upstream commit squizlabs/PHP_CodeSniffer/commit/2914011675cd13f8a7d5eae16ed1d5ee4f0e701d which is included in PHPCS 3.5.5. Also see: squizlabs/PHP_CodeSniffer 2895 and squizlabs/PHP_CodeSniffer 2523 Co-authored-by: Greg Sherwood <gsherwood@squiz.net>
Allow for arrow functions being used as function argument as per upstream commit squizlabs/PHP_CodeSniffer/commit/2914011675cd13f8a7d5eae16ed1d5ee4f0e701d which is included in PHPCS 3.5.5. Also see: squizlabs/PHP_CodeSniffer 2895 and squizlabs/PHP_CodeSniffer 2523 Co-authored-by: Greg Sherwood <gsherwood@squiz.net>
…g heredoc/nowdoc ... as per upstream commit squizlabs/PHP_CodeSniffer/commit/ce62dee92da3b038a399a99353fc055b39d2853e which will be included in PHPCS 3.5.6. Also see: squizlabs/PHP_CodeSniffer 2926 As the PHPCS Tokenizer will hang completely when it encounters an arrow function with a heredoc/nowdoc return in PHPCS 3.5.3-3.5.5, this change needs a separate test file as these tests need to be skipped on those PHPCS versions. Co-authored-by: Greg Sherwood <gsherwood@squiz.net>
jrfnl
deleted the
functiondeclarations/sync-arrow-functions-with-phpcs-356
branch
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
1 participant
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.
Follow up on #77 and #79
This syncs in additional changes from PHPCS upstream as released in PHPCS 3.5.5 and to be released in PHPCS 3.5.6 in the handling and recognition of arrow functions.
Commit Summary
FunctionDeclarations::getArrowFunctionOpenClose(): arrow functions as function argument
Allow for arrow functions being used as function argument as per upstream commit 291401 which is included in PHPCS 3.5.5.
Also see: squizlabs/PHP_CodeSniffer#2895 and squizlabs/PHP_CodeSniffer#2523
BCFile::findEndOfStatement(): arrow functions as function argument
Allow for arrow functions being used as function argument as per upstream commit 291401 which is included in PHPCS 3.5.5.
Also see: squizlabs/PHP_CodeSniffer#2895 and squizlabs/PHP_CodeSniffer#2523
FunctionDeclarations::getArrowFunctionOpenClose(): allow for returning heredoc/nowdoc
... as per upstream commit ce62dee which will be included in PHPCS 3.5.6.
Also see: squizlabs/PHP_CodeSniffer#2926
As the PHPCS Tokenizer will hang completely when it encounters an arrow function with a heredoc/nowdoc return in PHPCS 3.5.3-3.5.5, this change needs a separate test file as these tests need to be skipped on those PHPCS versions.