Added fixes for brace sniffs

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php

@@ -80,7 +80,15 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             // right next to each other.
             if ($tokens[$stackPtr]['scope_closer'] !== ($tokens[$stackPtr]['scope_opener'] + 1)) {
                 $error = 'The opening and closing braces of empty functions must be directly next to each other; e.g., function () {}';
-                $phpcsFile->addError($error, $closeBrace, 'SpacingBetween');
+                $fix   = $phpcsFile->addFixableError($error, $closeBrace, 'SpacingBetween');
+                if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                    $phpcsFile->fixer->beginChangeset();
+                    for ($i = ($tokens[$stackPtr]['scope_opener'] + 1); $i < $closeBrace; $i++) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->endChangeset();
+                }
             }
 
             return;
@@ -94,11 +102,29 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             // Nested function.
             if ($found < 0) {
                 $error = 'Closing brace of nested function must be on a new line';
-                $phpcsFile->addError($error, $closeBrace, 'ContentBeforeClose');
+                $fix   = $phpcsFile->addFixableError($error, $closeBrace, 'ContentBeforeClose');
+                if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                    $phpcsFile->fixer->addNewlineBefore($closeBrace);
+                }
             } else if ($found > 0) {
                 $error = 'Expected 0 blank lines before closing brace of nested function; %s found';
                 $data  = array($found);
-                $phpcsFile->addError($error, $closeBrace, 'SpacingBeforeNestedClose', $data);
+                $fix   = $phpcsFile->addFixableError($error, $closeBrace, 'SpacingBeforeNestedClose', $data);
+
+                if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                    $phpcsFile->fixer->beginChangeset();
+                    for ($i = ($prevContent + 1); $i < $closeBrace; $i++) {
+                        // Try and maintain indentation.
+                        if ($tokens[$i]['line'] === $braceLine) {
+                            break;
+                        }
+
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->addNewlineBefore($i);
+                    $phpcsFile->fixer->endChangeset();
+                }
             }
         } else {
             if ($found !== 1) {

CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php

@@ -88,7 +88,20 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         if ($found > 0) {
             $error = 'Expected 0 blank lines after opening function brace; %s found';
             $data  = array($found);
-            $phpcsFile->addError($error, $openBrace, 'SpacingAfter', $data);
+            $fix   = $phpcsFile->addFixableError($error, $openBrace, 'SpacingAfter', $data);
+            if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                $phpcsFile->fixer->beginChangeset();
+                for ($i = ($openBrace + 1); $i < $nextContent; $i++) {
+                    if ($tokens[$i]['line'] === $nextLine) {
+                        break;
+                    }
+
+                    $phpcsFile->fixer->replaceToken($i, '');
+                }
+
+                $phpcsFile->fixer->addNewline($openBrace);
+                $phpcsFile->fixer->endChangeset();
+            }
         }
 
         if ($phpcsFile->tokenizerType === 'JS') {
@@ -101,19 +114,51 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             if ($nestedFunction === true) {
                 if ($lineDifference > 0) {
                     $error = 'Opening brace should be on the same line as the function keyword';
-                    $phpcsFile->addError($error, $openBrace, 'SpacingAfterNested');
+                    $fix   = $phpcsFile->addFixableError($error, $openBrace, 'SpacingAfterNested');
+                    if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                        $phpcsFile->fixer->beginChangeset();
+                        for ($i = ($openBrace - 1); $i > $stackPtr; $i--) {
+                            if ($tokens[$i]['code'] !== T_WHITESPACE) {
+                                break;
+                            }
+
+                            $phpcsFile->fixer->replaceToken($i, '');
+                        }
+
+                        $phpcsFile->fixer->addContentBefore($openBrace, ' ');
+                        $phpcsFile->fixer->endChangeset();
+                    }
                 }
             } else {
                 if ($lineDifference === 0) {
                     $error = 'Opening brace should be on a new line';
-                    $phpcsFile->addError($error, $openBrace, 'ContentBefore');
+                    $fix   = $phpcsFile->addFixableError($error, $openBrace, 'ContentBefore');
+                    if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                        $phpcsFile->fixer->addNewlineBefore($openBrace);
+                    }
+
                     return;
                 }
 
                 if ($lineDifference > 1) {
                     $error = 'Opening brace should be on the line after the declaration; found %s blank line(s)';
                     $data  = array(($lineDifference - 1));
-                    $phpcsFile->addError($error, $openBrace, 'SpacingBefore', $data);
+                    $fix   = $phpcsFile->addError($error, $openBrace, 'SpacingBefore', $data);
+
+                    if ($fix === true && $phpcsFile->fixer->enabled === true) {
+                        $phpcsFile->fixer->beginChangeset();
+                        for ($i = ($openBrace - 1); $i > $stackPtr; $i--) {
+                            if ($tokens[$i]['code'] !== T_WHITESPACE) {
+                                break;
+                            }
+
+                            $phpcsFile->fixer->replaceToken($i, '');
+                        }
+
+                        $phpcsFile->fixer->addNewlineBefore($openBrace);
+                        $phpcsFile->fixer->endChangeset();
+                    }
+
                     return;
                 }
             }//end if