Code Style Fixes - Round 2

squizlabs · May 15, 2017 · 0d6ea72 · 0d6ea72
1 parent 41ad336
commit 0d6ea72
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
@@ -26,6 +26,7 @@ class MemberVarSpacingSniff extends AbstractVariableSniff
      */
     public $firstVarException = false;
 
+
     /**
      * Processes the function tokens within the class.
      *
@@ -96,8 +97,8 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
         $prev       = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($first - 1), null, true);
         $foundLines = ($tokens[$first]['line'] - $tokens[$prev]['line'] - 1);
 
-		// Exception to the newline requirement on the first member var after class opener.
-        if($this->firstVarException) {
+        // Exception to the newline requirement on the first member var after class opener.
+        if ($this->firstVarException === true) {
             if ($foundLines > 0 && $tokens[$prev]['code'] === T_OPEN_CURLY_BRACKET) {
                 $error = 'Expected 0 blank lines before first member var; %s found';
                 $data  = array($foundLines);
@@ -108,18 +109,21 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
                         if ($tokens[$i]['line'] === $tokens[$prev]['line']) {
                             continue;
                         }
+
                         if ($tokens[$i]['line'] === $tokens[$first]['line']) {
                             break;
                         }
+
                         $phpcsFile->fixer->replaceToken($i, '');
                     }
                     $phpcsFile->fixer->endChangeset();
                 }
             }
-		}
-		if ($foundLines === 1 || ($this->firstVarException && $tokens[$prev]['code'] === T_OPEN_CURLY_BRACKET)) {
-			return;
-		}
+        }
+
+        if ($foundLines === 1 || ($this->firstVarException === true && $tokens[$prev]['code'] === T_OPEN_CURLY_BRACKET)) {
+            return;
+        }
 
         $error = 'Expected 1 blank line before member var; %s found';
         $data  = array($foundLines);