Squiz FunctionOpeningBraceSpaceSniff no longer does additional checks for JS functions

Author: gsherwood

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

@@ -107,74 +107,6 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             }
         }
 
-        if ($phpcsFile->tokenizerType !== 'JS') {
-            return;
-        }
-
-        // Do some additional checking before the function brace.
-        $nestedFunction = false;
-        if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION) === true
-            || $phpcsFile->hasCondition($stackPtr, T_CLOSURE) === true
-            || isset($tokens[$stackPtr]['nested_parenthesis']) === true
-        ) {
-            $nestedFunction = true;
-        }
-
-        $functionLine   = $tokens[$tokens[$stackPtr]['parenthesis_closer']]['line'];
-        $lineDifference = ($braceLine - $functionLine);
-
-        if ($nestedFunction === true) {
-            if ($lineDifference > 0) {
-                $error = 'Opening brace should be on the same line as the function keyword';
-                $fix   = $phpcsFile->addFixableError($error, $openBrace, 'SpacingAfterNested');
-                if ($fix === 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';
-                $fix   = $phpcsFile->addFixableError($error, $openBrace, 'ContentBefore');
-                if ($fix === 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));
-                $fix   = $phpcsFile->addError($error, $openBrace, 'SpacingBefore', $data);
-
-                if ($fix === 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
-        }//end if
-
     }//end process()
 
 

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.js

@@ -36,6 +36,7 @@ function FuncFour()
 
 AbstractAttributeEditorWidgetType.prototype = {
     isActive: function() {
+
         return this.active;
 
     },
@@ -85,6 +86,8 @@ HelpWidgetType.prototype = {
     var x = 1;
     var y = {
         test: function() {
+
+
             alert(3);
         }
     }

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php

@@ -56,10 +56,7 @@ public function getErrorList($testFile='FunctionOpeningBraceSpaceUnitTest.inc')
                     11 => 1,
                     31 => 1,
                     38 => 1,
-                    57 => 1,
-                    60 => 1,
-                    73 => 1,
-                    84 => 1,
+                    88 => 1,
                    );
             break;
         default:

package.xml

@@ -42,6 +42,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- File paths are only processed if no files were specified on the command line
   - Squiz coding standard now requires lowercase PHP constants (true, false and null)
     -- Removed Squiz.NamingConventions.ConstantCase sniff as the rule is now consistent across PHP and JS files
+  - Squiz FunctionOpeningBraceSpaceSniff no longer does additional checks for JS functions
+    -- PHP and JS functions and closures are now treated the same way
   - Interactive mode no longer breaks if you also specify a report type on the command line
   - PEAR InlineCommentSniff now fixes the Perl-style comments that it finds (request #375)
   - PSR2 standard no longer fixes the placement of docblock open tags as comments are excluded from this standard