Removed error Squiz.Classes.ClassDeclaration.NoNewlineAfterCloseBrace…

… (request #285)

CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php

@@ -151,22 +151,16 @@ public function processClose(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         }
 
         if ($nextContent < $phpcsFile->numTokens) {
-            $nextLine  = $tokens[$nextContent]['line'];
-            $braceLine = $tokens[$closeBrace]['line'];
-            if ($braceLine === $nextLine) {
-                $error = 'Closing brace of a %s must be followed by a single blank line';
-                $data  = array($tokens[$stackPtr]['content']);
-                $phpcsFile->addError($error, $closeBrace, 'NoNewlineAfterCloseBrace', $data);
-            } else if ($nextLine !== ($braceLine + 2)) {
-                $difference = ($nextLine - $braceLine - 1);
+            $difference = ($tokens[$nextContent]['line'] - $tokens[$closeBrace]['line'] - 1);
+            if ($difference !== 1) {
                 $error      = 'Closing brace of a %s must be followed by a single blank line; found %s';
                 $data       = array(
                                $tokens[$stackPtr]['content'],
                                $difference,
                               );
                 $phpcsFile->addError($error, $closeBrace, 'NewlinesAfterCloseBrace', $data);
             }
-        }//end if
+        }
 
         // Check the closing brace is on it's own line, but allow
         // for comments like "//end class".

CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc

@@ -102,4 +102,4 @@ class CorrectClassDeclaration
 // Class comment here, but wrong comment type.
 class testing
 {
-}//end class
+} /* end class */ echo 'hi';

CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php

@@ -73,6 +73,7 @@ public function getErrorList()
                 92  => 1,
                 97  => 1,
                 103 => 1,
+                105 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -43,6 +43,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz EmbeddedPhpSniff now checks open and close tag indents and fixes some errors
   - Squiz FileCommentSniff no longer throws incorrect blank line before comment errors in JS files
   - Squiz ClassDeclarationSniff now has better checking for blank lines after a closing brace
+  - Removed error Squiz.Classes.ClassDeclaration.NoNewlineAfterCloseBrace (request #285)
+    -- already handled by Squiz.Classes.ClassDeclaration.CloseBraceSameLine
   - Fixed bug #280 : The --config-show option generates error when there is no config file
  </notes>
  <contents>