Merge pull request #1052 from PHPCSStandards/phpcs-4.0/remove-output-buffering-from-fixer

Fixer: remove output buffering

Author: jrfnl

src/Files/File.php

@@ -1047,9 +1047,7 @@ protected function addMessage($error, $message, $line, $column, $code, $data, $s
             && $this->fixer->enabled === true
             && $fixable === true
         ) {
-            @ob_end_clean();
             StatusWriter::forceWrite("E: [Line $line] $message ($sniffCode)", 1);
-            ob_start();
         }
 
         return true;

src/Fixer.php

@@ -155,13 +155,10 @@ public function fixFile()
 
         $this->loops = 0;
         while ($this->loops < 50) {
-            ob_start();
-
             // Only needed once file content has changed.
             $contents = $this->getContents();
 
             if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                @ob_end_clean();
                 StatusWriter::forceWrite('---START FILE CONTENT---');
                 $lines = explode($this->currentFile->eolChar, $contents);
                 $max   = strlen(count($lines));
@@ -171,14 +168,12 @@ public function fixFile()
                 }
 
                 StatusWriter::forceWrite('--- END FILE CONTENT ---');
-                ob_start();
             }
 
             $this->inConflict = false;
             $this->currentFile->ruleset->populateTokenListeners();
             $this->currentFile->setContent($contents);
             $this->currentFile->process();
-            ob_end_clean();
 
             $this->loops++;
 
@@ -212,12 +207,7 @@ public function fixFile()
 
         if ($this->numFixes > 0 || $this->inConflict === true) {
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                if (ob_get_level() > 0) {
-                    ob_end_clean();
-                }
-
                 StatusWriter::write("*** Reached maximum number of loops with $this->numFixes violations left unfixed ***", 1);
-                ob_start();
             }
 
             return false;
@@ -417,9 +407,7 @@ public function beginChangeset()
 
             $line = $bt[0]['line'];
 
-            @ob_end_clean();
             StatusWriter::forceWrite("=> Changeset started by $sniff:$line", 1);
-            ob_start();
         }
 
         $this->changeset   = [];
@@ -459,15 +447,11 @@ public function endChangeset()
             }
 
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
                 StatusWriter::forceWrite('=> Changeset failed to apply', 1);
-                ob_start();
             }
         } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
             $fixes = count($this->changeset);
-            @ob_end_clean();
             StatusWriter::forceWrite("=> Changeset ended: $fixes changes applied", 1);
-            ob_start();
         }
 
         $this->changeset = [];
@@ -501,10 +485,8 @@ public function rollbackChangeset()
 
                 $numChanges = count($this->changeset);
 
-                @ob_end_clean();
                 StatusWriter::forceWrite("R: $sniff:$line rolled back the changeset ($numChanges changes)", 2);
                 StatusWriter::forceWrite('=> Changeset rolled back', 1);
-                ob_start();
             }
 
             $this->changeset = [];
@@ -536,9 +518,7 @@ public function replaceToken($stackPtr, $content)
             }
 
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
                 StatusWriter::forceWrite("* token $stackPtr has already been modified, skipping *", $depth);
-                ob_start();
             }
 
             return false;
@@ -573,9 +553,7 @@ public function replaceToken($stackPtr, $content)
             $this->changeset[$stackPtr] = $content;
 
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
                 StatusWriter::forceWrite("Q: $sniff:$line replaced token $stackPtr ($type on line $tokenLine) \"$oldContent\" => \"$newContent\"", 2);
-                ob_start();
             }
 
             return true;
@@ -599,7 +577,6 @@ public function replaceToken($stackPtr, $content)
 
                     $loop = $this->oldTokenValues[$stackPtr]['loop'];
 
-                    @ob_end_clean();
                     StatusWriter::forceWrite("**** $sniff:$line has possible conflict with another sniff on loop $loop; caused by the following change ****", $depth);
                     StatusWriter::forceWrite("**** replaced token $stackPtr ($type on line $tokenLine) \"$oldContent\" => \"$newContent\" ****", $depth);
                 }
@@ -611,10 +588,6 @@ public function replaceToken($stackPtr, $content)
                     }
                 }
 
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    ob_start();
-                }
-
                 return false;
             }//end if
 
@@ -635,12 +608,7 @@ public function replaceToken($stackPtr, $content)
                 $depth         = 2;
             }
 
-            if (ob_get_level() > 0) {
-                ob_end_clean();
-            }
-
             StatusWriter::forceWrite($statusMessage, $depth);
-            ob_start();
         }
 
         return true;
@@ -698,9 +666,7 @@ public function revertToken($stackPtr)
                 $depth         = 2;
             }
 
-            @ob_end_clean();
             StatusWriter::forceWrite($statusMessage, $depth);
-            ob_start();
         }
 
         return true;

src/Reports/Cbf.php

@@ -42,7 +42,6 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
         $errors = $phpcsFile->getFixableCount();
         if ($errors !== 0) {
             if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                ob_end_clean();
                 $startTime = microtime(true);
                 $newlines  = 0;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
@@ -105,10 +104,6 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
             }
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            ob_start();
-        }
-
         $errorCount   = $phpcsFile->getErrorCount();
         $warningCount = $phpcsFile->getWarningCount();
         $fixableCount = $phpcsFile->getFixableCount();

src/Reports/Diff.php

@@ -65,15 +65,13 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
         }//end if
 
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            ob_end_clean();
             StatusWriter::write('*** START FILE FIXING ***', 1);
         }
 
         $fixed = $phpcsFile->fixer->fixFile();
 
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             StatusWriter::write('*** END FILE FIXING ***', 1);
-            ob_start();
         }
 
         if ($fixed === false) {