WhiteSpace\BraceBlankLine - fixer issue with empty structure

webimpress · Jun 8, 2019 · ac227bd · ac227bd
1 parent 5df57b6
commit ac227bd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/WebimpressCodingStandard/Sniffs/WhiteSpace/BraceBlankLineSniff.php b/src/WebimpressCodingStandard/Sniffs/WhiteSpace/BraceBlankLineSniff.php
@@ -44,8 +44,8 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $closer = $tokens[$stackPtr]['bracket_closer'];
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $closer - 1, null, true);
-        if ($tokens[$closer]['line'] > $tokens[$prev]['line'] + 1) {
+        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $closer - 1, $stackPtr + 1, true);
+        if ($prev && $tokens[$closer]['line'] > $tokens[$prev]['line'] + 1) {
             $error = 'Blank line found before closing brace';
             $fix = $phpcsFile->addFixableError($error, $closer, 'SpacingBeforeClose');
 

diff --git a/test/Sniffs/WhiteSpace/BraceBlankLineUnitTest.inc b/test/Sniffs/WhiteSpace/BraceBlankLineUnitTest.inc
@@ -133,3 +133,9 @@ if (true) {
     // comment here
 
 }
+
+try {
+    new DateTime();
+} catch (Throwable $th) {
+
+}
diff --git a/test/Sniffs/WhiteSpace/BraceBlankLineUnitTest.inc.fixed b/test/Sniffs/WhiteSpace/BraceBlankLineUnitTest.inc.fixed
@@ -89,3 +89,8 @@ $a{1};
 if (true) {
     // comment here
 }
+
+try {
+    new DateTime();
+} catch (Throwable $th) {
+}
diff --git a/test/Sniffs/WhiteSpace/BraceBlankLineUnitTest.php b/test/Sniffs/WhiteSpace/BraceBlankLineUnitTest.php
@@ -52,6 +52,7 @@ protected function getErrorList(string $testFile = '') : array
             127 => 1,
             131 => 1,
             135 => 1,
+            139 => 1,
         ];
     }