Don't record line length metrics for empty lines + some additional fixes to detect mixed indents

Author: gsherwood

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

@@ -88,6 +88,8 @@ public function process(File $phpcsFile, $stackPtr)
                 $content = $tokens[$i]['content'];
             }
 
+            $recordMetrics = true;
+
             // If this is an inline HTML token, split the content into
             // indentation whitespace and the actual HTML/text.
             $nonWhitespace = '';
@@ -105,6 +107,9 @@ public function process(File $phpcsFile, $stackPtr)
                 // There is no content after this whitespace except for a newline.
                 $content       = rtrim($content, "\r\n");
                 $nonWhitespace = $phpcsFile->eolChar;
+
+                // Don't record metrics for empty lines.
+                $recordMetrics = false;
             }
 
             $hasSpaces = strpos($content, ' ');
@@ -117,7 +122,10 @@ public function process(File $phpcsFile, $stackPtr)
 
             if ($hasSpaces === false && $hasTabs !== false) {
                 // All ok, nothing to do.
-                $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                if ($recordMetrics === true) {
+                    $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                }
+
                 continue;
             }
 
@@ -136,7 +144,9 @@ public function process(File $phpcsFile, $stackPtr)
             $tabAfterSpaces = strpos($content, "\t", $hasSpaces);
 
             if ($hasTabs === false) {
-                $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
+                if ($recordMetrics === true) {
+                    $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
+                }
 
                 if ($numTabs === 0) {
                     // Ignore: precision indentation.
@@ -145,14 +155,20 @@ public function process(File $phpcsFile, $stackPtr)
             } else {
                 if ($numTabs === 0) {
                     // Precision indentation.
-                    $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                    if ($recordMetrics === true) {
+                        if ($tabAfterSpaces !== false) {
+                            $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+                        } else {
+                            $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                        }
+                    }
 
                     if ($tabAfterSpaces === false) {
                         // Ignore: precision indentation is already at the
                         // end of the whitespace.
                         continue;
                     }
-                } else {
+                } else if ($recordMetrics === true) {
                     $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
                 }
             }//end if

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

@@ -83,23 +83,38 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }
 
+            $recordMetrics = true;
+            if (isset($tokens[($i + 1)]) === true
+                && $tokens[$i]['line'] < $tokens[($i + 1)]['line']
+            ) {
+                // Don't record metrics for empty lines.
+                $recordMetrics = false;
+            }
+
             $tabFound = false;
             if ($tokens[$i]['column'] === 1) {
                 if ($content[0] === "\t") {
                     $tabFound = true;
-                    if (strpos($content, ' ') !== false) {
-                        $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
-                    } else {
-                        $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                    if ($recordMetrics === true) {
+                        $spacePosition  = strpos($content, ' ');
+                        $tabAfterSpaces = strpos($content, "\t", $spacePosition);
+                        if ($spacePosition !== false && $tabAfterSpaces !== false) {
+                            $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+                        } else {
+                            $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                        }
                     }
                 } else if ($content[0] === ' ') {
                     if (strpos($content, "\t") !== false) {
-                        $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+                        if ($recordMetrics === true) {
+                            $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+                        }
+
                         $tabFound = true;
-                    } else {
+                    } else if ($recordMetrics === true) {
                         $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
                     }
-                }
+                }//end if
             } else {
                 // Look for tabs so we can report and replace, but don't
                 // record any metrics about them because they aren't