Review the proposed patch then download it to apply it manually or execute the following command from the repository root directory:
curl https://fabbot.io/patch/FriendsOfPHP/PHP-CS-Fixer/4970/15d6f1e82978deff03ddb2a2963a86553454b9e5/cs.diff | patch -p0
diff -ru src/Fixer/Basic/BracesFixer.php src/Fixer/Basic/BracesFixer.php
--- src/Fixer/Basic/BracesFixer.php 2021-05-03 22:11:37.051449853 +0000
+++ src/Fixer/Basic/BracesFixer.php 2021-05-03 22:11:40.708360080 +0000
@@ -189,8 +189,8 @@
if ($token->isGivenKind($controlTokens)) {
$prevIndex = $this->findParenthesisEnd($tokens, $index);
} elseif (
- ($token->isGivenKind(T_FUNCTION) && $tokensAnalyzer->isLambda($index)) ||
- ($token->isGivenKind(T_CLASS) && $tokensAnalyzer->isAnonymousClass($index))
+ ($token->isGivenKind(T_FUNCTION) && $tokensAnalyzer->isLambda($index))
+ || ($token->isGivenKind(T_CLASS) && $tokensAnalyzer->isAnonymousClass($index))
) {
$prevIndex = $tokens->getNextTokenOfKind($index, ['{']);
$prevIndex = $tokens->getPrevMeaningfulToken($prevIndex);
@@ -423,15 +423,15 @@
!($nextNonWhitespaceNestToken->isComment() && (
!$tokens[$nextNonWhitespaceNestIndex - 1]->isWhitespace()
|| !Preg::match('/\R/', $tokens[$nextNonWhitespaceNestIndex - 1]->getContent())
- )) &&
+ ))
// and it is not a `$foo = function () {};` situation
- !($nestToken->equals('}') && $nextNonWhitespaceNestToken->equalsAny([';', ',', ']', [CT::T_ARRAY_SQUARE_BRACE_CLOSE]])) &&
+ && !($nestToken->equals('}') && $nextNonWhitespaceNestToken->equalsAny([';', ',', ']', [CT::T_ARRAY_SQUARE_BRACE_CLOSE]]))
// and it is not a `Foo::{bar}()` situation
- !($nestToken->equals('}') && $nextNonWhitespaceNestToken->equals('(')) &&
+ && !($nestToken->equals('}') && $nextNonWhitespaceNestToken->equals('('))
// and it is not a `${"a"}->...` and `${"b{$foo}"}->...` situation
- !($nestToken->equals('}') && $tokens[$nestIndex - 1]->equalsAny(['"', "'", [T_CONSTANT_ENCAPSED_STRING], [T_VARIABLE]])) &&
+ && !($nestToken->equals('}') && $tokens[$nestIndex - 1]->equalsAny(['"', "'", [T_CONSTANT_ENCAPSED_STRING], [T_VARIABLE]]))
// and next token is not a closing tag that would break heredoc/nowdoc syntax
- !($tokens[$nestIndex - 1]->isGivenKind(T_END_HEREDOC) && $nextNonWhitespaceNestToken->isGivenKind(T_CLOSE_TAG))
+ && !($tokens[$nestIndex - 1]->isGivenKind(T_END_HEREDOC) && $nextNonWhitespaceNestToken->isGivenKind(T_CLOSE_TAG))
) {
if (
(
@@ -908,8 +908,8 @@
// eg: `declare(ticks=1){` => `declare(ticks=1) {`
// eg: `declare(ticks=1) {` => `declare(ticks=1) {`
if (
- !$tokens[$startBraceIndex - 1]->isWhitespace() ||
- $tokens[$startBraceIndex - 1]->isWhitespace(" \t")
+ !$tokens[$startBraceIndex - 1]->isWhitespace()
+ || $tokens[$startBraceIndex - 1]->isWhitespace(" \t")
) {
$tokens->ensureWhitespaceAtIndex($startBraceIndex - 1, 1, ' ');
}