Merge pull request #296 from PHPCSStandards/feature/generic-arbitraryparenthesesspacing-bugfix

Generic/ArbitraryParenthesesSpacing: improve handling of switch-case scope closers

Author: jrfnl

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

@@ -103,7 +103,8 @@ 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
-            && isset($tokens[$preOpener]['scope_condition']) === false
+            && ($tokens[$preOpener]['code'] !== T_CLOSE_CURLY_BRACKET
+            || isset($tokens[$preOpener]['scope_condition']) === false )
         ) {
             // Function or language construct call.
             return;

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

@@ -180,3 +180,13 @@ class NonArbitraryParenthesesWithKeywords {
 $b = match (  $a  ) {
     1 => true,
 };
+
+// Parentheses after die/exit in a switch case should be ignored.
+switch ( $type ) {
+    case A:
+        exit(    1    );
+    case B:
+        die();
+    default:
+        break;
+}

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

@@ -168,3 +168,13 @@ class NonArbitraryParenthesesWithKeywords {
 $b = match (  $a  ) {
     1 => true,
 };
+
+// Parentheses after die/exit in a switch case should be ignored.
+switch ( $type ) {
+    case A:
+        exit(    1    );
+    case B:
+        die();
+    default:
+        break;
+}