PSR2/ClassDeclaration: bug fix - blank line fixer also removes indent

The `PSR2.Classes.ClassDeclaration.CloseBraceAfterBody` related logic checks that there is no blank line between the last content within the class and the close brace.

The fixer for this error code, however, does not take indented class declarations into account and inadvertently also removes (correct) indentation.

Fixed now. Includes unit test.

src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php

@@ -492,12 +492,12 @@ public function processClose(File $phpcsFile, $stackPtr)
 
             if ($fix === true) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($prevContent + 1); $i < $closeBrace; $i++) {
+                for ($i = ($prevContent + 1); $tokens[$i]['line'] !== $tokens[$closeBrace]['line']; $i++) {
                     $phpcsFile->fixer->replaceToken($i, '');
                 }
 
                 if (strpos($tokens[$prevContent]['content'], $phpcsFile->eolChar) === false) {
-                    $phpcsFile->fixer->replaceToken($closeBrace, $phpcsFile->eolChar.$tokens[$closeBrace]['content']);
+                    $phpcsFile->fixer->addNewline($prevContent);
                 }
 
                 $phpcsFile->fixer->endChangeset();

src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc

@@ -248,3 +248,12 @@ class Test
 readonly    class Test
 {
 }
+
+if (!class_exists('IndentedDeclaration')) {
+    class IndentedDeclaration
+    {
+        function foo() {}
+
+
+    }
+}

src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc.fixed

@@ -240,3 +240,10 @@ readonly class Test
 readonly class Test
 {
 }
+
+if (!class_exists('IndentedDeclaration')) {
+    class IndentedDeclaration
+    {
+        function foo() {}
+    }
+}

src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php

@@ -65,6 +65,7 @@ public function getErrorList()
             235 => 1,
             244 => 1,
             248 => 1,
+            258 => 1,
         ];
 
     }//end getErrorList()