Further fix for #2810 to make the new check more specific

squizlabs · Feb 18, 2020 · 19c8127 · 19c8127
1 parent 0547626
commit 19c8127
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
@@ -77,7 +77,8 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($tokens[$nonSpace]['code'] === T_SEMICOLON
             || ($forCondition === true && $nonSpace === $tokens[$owner]['parenthesis_opener'])
-            || (isset($tokens[$nonSpace]['scope_opener']) === true)
+            || (isset($tokens[$nonSpace]['scope_opener']) === true
+            && $tokens[$nonSpace]['scope_opener'] === $nonSpace)
         ) {
             // Empty statement.
             return;

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc
@@ -29,6 +29,13 @@ for ( ; ; ) {}
 for ( /* Deliberately left empty. */ ; $ptr >= 0; $ptr-- ) {}
 for ( $i = 1 ; /* Deliberately left empty. */ ; $i++ ) {}
 
+switch ($foo) {
+    case 'foo':
+    ;
+    break
+    ;
+}
+
 // This is an empty statement and should be ignored.
 if ($foo) {
 ;

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc.fixed
@@ -29,6 +29,12 @@ for ( ; ; ) {}
 for ( /* Deliberately left empty. */; $ptr >= 0; $ptr-- ) {}
 for ( $i = 1; /* Deliberately left empty. */; $i++ ) {}
 
+switch ($foo) {
+    case 'foo':
+    ;
+    break;
+}
+
 // This is an empty statement and should be ignored.
 if ($foo) {
 ;

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
@@ -41,6 +41,7 @@ public function getErrorList($testFile='SemicolonSpacingUnitTest.inc')
                 18 => 1,
                 29 => 1,
                 30 => 2,
+                36 => 1,
             ];
             break;
         case 'SemicolonSpacingUnitTest.js':
-Original file line number
+Diff line change
@@ Expand Up @@
 => 1,
 => 1,
 => 2,
+=> 1,
                 ];
                 break;
             case 'SemicolonSpacingUnitTest.js':
@@ Expand Down @@