Merge branch 'phpcs-4.x/fix-stderr-output' of https://github.com/jrfnl/PHP_CodeSniffer into 4.0

Author: gsherwood

src/Reports/Code.php

@@ -45,9 +45,9 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
         if (empty($tokens) === true) {
             if (PHP_CODESNIFFER_VERBOSITY === 1) {
                 $startTime = microtime(true);
-                echo 'CODE report is parsing '.basename($file).' ';
+                Util\Common::forcePrintStatusMessage('CODE report is parsing '.basename($file).' ', 0, true);
             } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                echo "CODE report is forcing parse of $file".PHP_EOL;
+                Util\Common::forcePrintStatusMessage("CODE report is forcing parse of $file", 0);
             }
 
             try {
@@ -61,13 +61,11 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
                 $timeTaken = ((microtime(true) - $startTime) * 1000);
                 if ($timeTaken < 1000) {
                     $timeTaken = round($timeTaken);
-                    echo "DONE in {$timeTaken}ms";
+                    Util\Common::forcePrintStatusMessage("DONE in {$timeTaken}ms", 0);
                 } else {
                     $timeTaken = round(($timeTaken / 1000), 2);
-                    echo "DONE in $timeTaken secs";
+                    Util\Common::forcePrintStatusMessage("DONE in $timeTaken secs", 0);
                 }
-
-                echo PHP_EOL;
             }
 
             $tokens = $phpcsFile->getTokens();

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

@@ -332,7 +332,7 @@ public function process(File $phpcsFile, $stackPtr)
                         if ($this->debug === true) {
                             $line = $tokens[$first]['line'];
                             $type = $tokens[$first]['type'];
-                            echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                            Common::printStatusMessage("* first token on line $line is $first ($type) *", 1);
                         }
 
                         $checkIndent = ($tokens[$first]['column'] - 1);

src/Tokenizers/Tokenizer.php

@@ -694,8 +694,7 @@ private function createTokenMap()
             } else if ($this->tokens[$i]['code'] === T_ATTRIBUTE) {
                 $openers[] = $i;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", count($openers));
-                    echo "=> Found attribute opener at $i".PHP_EOL;
+                    Common::printStatusMessage("=> Found attribute opener at $i", count($openers));
                 }
 
                 $this->tokens[$i]['attribute_opener'] = $i;
@@ -708,8 +707,7 @@ private function createTokenMap()
                         $this->tokens[$opener]['attribute_closer'] = $i;
 
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", (count($openers) + 1));
-                            echo "=> Found attribute closer at $i for $opener".PHP_EOL;
+                            Common::printStatusMessage("=> Found attribute closer at $i for $opener", (count($openers) + 1));
                         }
 
                         for ($x = ($opener + 1); $x <= $i; ++$x) {
@@ -721,8 +719,7 @@ private function createTokenMap()
                             $this->tokens[$x]['attribute_closer'] = $i;
                         }
                     } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", (count($openers) + 1));
-                        echo "=> Found unowned attribute closer at $i for $opener".PHP_EOL;
+                        Common::printStatusMessage("=> Found unowned attribute closer at $i for $opener", (count($openers) + 1));
                     }
                 }//end if