Skip to content

Commit 9b53412

Browse files
Handle parenthesis after scope condition closer
1 parent db617f1 commit 9b53412

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ public function process(File $phpcsFile, $stackPtr)
102102
}
103103

104104
$preOpener = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), null, true);
105-
if ($preOpener !== false && isset($this->ignoreTokens[$tokens[$preOpener]['code']]) === true) {
105+
if ($preOpener !== false
106+
&& isset($this->ignoreTokens[$tokens[$preOpener]['code']]) === true
107+
&& isset($tokens[$preOpener]['scope_condition']) === false
108+
) {
106109
// Function or language construct call.
107110
return;
108111
}

src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,7 @@ $a = (
159159
null !== $extra
160160
);
161161
// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
162+
163+
if (true) {} ( 1+2) === 3 ? $a = 1 : $a = 2;
164+
class A {} ( 1+2) === 3 ? $a = 1 : $a = 2;
165+
function foo() {} ( 1+2) === 3 ? $a = 1 : $a = 2;

src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc.fixed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,7 @@ $a = (
147147
null !== $extra
148148
);
149149
// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
150+
151+
if (true) {} (1+2) === 3 ? $a = 1 : $a = 2;
152+
class A {} (1+2) === 3 ? $a = 1 : $a = 2;
153+
function foo() {} (1+2) === 3 ? $a = 1 : $a = 2;

src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ public function getErrorList()
5656
141 => 1,
5757
144 => 1,
5858
146 => 1,
59+
163 => 1,
60+
164 => 1,
61+
165 => 1,
5962
];
6063

6164
}//end getErrorList()

0 commit comments

Comments
 (0)