Don't enforce closure open paren spacing by default

Fixes #439
WordPress · Sep 30, 2015 · c3e0e45 · c3e0e45
1 parent e9bb0a2
commit c3e0e45
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -60,7 +60,7 @@ class WordPress_Sniffs_WhiteSpace_ControlStructureSpacingSniff extends WordPress
 	 *
 	 * @var int
 	 */
-	public $spaces_before_closure_open_paren = 0;
+	public $spaces_before_closure_open_paren = -1;
 
     /**
      * Returns an array of tokens this test wants to listen for.
@@ -106,7 +106,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         if ($tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE
             && ! ( $tokens[$stackPtr]['code'] === T_ELSE && $tokens[($stackPtr + 1)]['code'] === T_COLON )
-            && ! ( T_CLOSURE === $tokens[ $stackPtr ]['code'] && 0 === (int) $this->spaces_before_closure_open_paren )
+            && ! (
+                T_CLOSURE === $tokens[ $stackPtr ]['code']
+                && (
+                    0 === (int) $this->spaces_before_closure_open_paren
+                    || -1 === (int) $this->spaces_before_closure_open_paren
+                )
+            )
         ) {
             $error = 'Space after opening control structure is required';
             if (isset($phpcsFile->fixer) === true) {
@@ -263,7 +269,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     }
                 }
 
-            } elseif ( ($stackPtr + 1) === $parenthesisOpener ) {
+            } elseif (
+                (
+                    T_CLOSURE !== $tokens[ $stackPtr ]['code']
+                    || 1 === (int) $this->spaces_before_closure_open_paren
+                )
+                && ($stackPtr + 1) === $parenthesisOpener
+            ) {
 
                 // Checking this: if[*](...) {}.
                 $error = 'No space before opening parenthesis is prohibited';

diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc
@@ -99,3 +99,11 @@ $closureWithArgsAndVars = function ( $arg1, $arg2 )  use ( $var1, $var2 ) {}; //
 
 // Namespaces.
 use Foo\Admin;
+
+// @codingStandardsChangeSetting WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren -1
+
+function( $arg ) {} // OK
+function ( $arg ) {} // OK
+
+$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // OK
+$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // OK
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc.fixed
@@ -95,3 +95,11 @@ $closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; //
 
 // Namespaces.
 use Foo\Admin;
+
+// @codingStandardsChangeSetting WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren -1
+
+function( $arg ) {} // OK
+function ( $arg ) {} // OK
+
+$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // OK
+$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // OK