Handle parenthesis after scope condition closer

squizlabs · Feb 22, 2020 · 9b53412 · 9b53412
1 parent db617f1
commit 9b53412
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
@@ -102,7 +102,10 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $preOpener = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), null, true);
-        if ($preOpener !== false && isset($this->ignoreTokens[$tokens[$preOpener]['code']]) === true) {
+        if ($preOpener !== false
+            && isset($this->ignoreTokens[$tokens[$preOpener]['code']]) === true
+            && isset($tokens[$preOpener]['scope_condition']) === false
+        ) {
             // Function or language construct call.
             return;
         }

diff --git a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc
@@ -159,3 +159,7 @@ $a = (
     null !== $extra
 );
 // phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
+
+if (true) {} ( 1+2) === 3 ? $a = 1 : $a = 2;
+class A {} ( 1+2) === 3 ? $a = 1 : $a = 2;
+function foo() {} ( 1+2) === 3 ? $a = 1 : $a = 2;
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc.fixed
@@ -147,3 +147,7 @@ $a = (
     null !== $extra
 );
 // phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
+
+if (true) {} (1+2) === 3 ? $a = 1 : $a = 2;
+class A {} (1+2) === 3 ? $a = 1 : $a = 2;
+function foo() {} (1+2) === 3 ? $a = 1 : $a = 2;
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
@@ -56,6 +56,9 @@ public function getErrorList()
             141 => 1,
             144 => 1,
             146 => 1,
+            163 => 1,
+            164 => 1,
+            165 => 1,
         ];
 
     }//end getErrorList()