Fixed bug #1702 : Generic.WhiteSpaceDisallowSpaceIndent fixer bug when line only contains superfluous whitespace

Author: gsherwood

package.xml

@@ -48,6 +48,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #1681 : Huge arrays are super slow to scan with Squiz.Arrays.ArrayDeclaration sniff
   - Fixed bug #1694 : Squiz.Arrays.ArrayBracketSpacing is removing some comments during fixing
     -- Thanks to Juliette Reinders Folmer for the patch
+  - Fixed bug #1702 : Generic.WhiteSpaceDisallowSpaceIndent fixer bug when line only contains superfluous whitespace
  </notes>
  <contents>
   <dir name="/">

src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php

@@ -99,6 +99,12 @@ public function process(File $phpcsFile, $stackPtr)
                 if (isset($matches[2]) === true) {
                     $nonWhitespace = $matches[2];
                 }
+            } else if (isset($tokens[($i + 1)]) === true
+                && $tokens[$i]['line'] < $tokens[($i + 1)]['line']
+            ) {
+                // There is no content after this whitespace except for a newline.
+                $content       = rtrim($content, "\r\n");
+                $nonWhitespace = $phpcsFile->eolChar;
             }
 
             $hasSpaces = strpos($content, ' ');
@@ -116,7 +122,7 @@ public function process(File $phpcsFile, $stackPtr)
             }
 
             if ($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE && $content === ' ') {
-                // Ignore file/class-level DocBlock, especially for recording metrics.
+                // Ignore file/class-level docblocks, especially for recording metrics.
                 continue;
             }
 

src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.inc

@@ -68,3 +68,15 @@ $x = 1;
 	        echo 'And another one.'
     	    echo 'And another one.'
         	echo 'And another one.'
+
+// Spaces after comment.
+    
+$x = 1;
+
+// Mixed tabs and spaces after comment.
+	    
+$x = 1;
+
+// Mixed spaces and tabs after comment.
+    		   
+$x = 1;

src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.inc.fixed

@@ -68,3 +68,15 @@ $x = 1;
 			echo 'And another one.'
 			echo 'And another one.'
 			echo 'And another one.'
+
+// Spaces after comment.
+	
+$x = 1;
+
+// Mixed tabs and spaces after comment.
+		
+$x = 1;
+
+// Mixed spaces and tabs after comment.
+			   
+$x = 1;

src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php

@@ -49,6 +49,9 @@ public function getErrorList($testFile='DisallowSpaceIndentUnitTest.inc')
                     68 => 1,
                     69 => 1,
                     70 => 1,
+                    73 => 1,
+                    77 => 1,
+                    81 => 1,
                    );
             break;
         case 'DisallowSpaceIndentUnitTest.js':