Fixed bug #1615 : Uncaught RuntimeException when phpcbf fails to fix …

…files
squizlabs · Sep 5, 2017 · 9f8d6a6 · 9f8d6a6
1 parent 121d545
commit 9f8d6a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/package.xml b/package.xml
@@ -82,6 +82,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #1591 : Autoloader failing to load arbitrary files when installed_paths only set via a custom ruleset
   - Fixed bug #1605 : Squiz.WhiteSpace.OperatorSpacing false positive on unary minus after comment
     -- Thanks to Juliette Reinders Folmer for the patch
+  - Fixed bug #1615 : Uncaught RuntimeException when phpcbf fails to fix files
   - Fixed bug #1637 : Generic.WhiteSpaceScopeIndent closure argument indenting incorrect with multi-line strings
   - Fixed bug #1638 : Squiz.WhiteSpace.ScopeClosingBrace closure argument indenting incorrect with multi-line strings
   - Fixed bug #1640 : Squiz.Strings.DoubleQuoteUsage replaces tabs with spaces when fixing

diff --git a/src/Fixer.php b/src/Fixer.php
@@ -203,7 +203,10 @@ public function fixFile()
 
         if ($this->numFixes > 0) {
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
+                if (ob_get_level() > 0) {
+                    ob_end_clean();
+                }
+
                 echo "\t*** Reached maximum number of loops with $this->numFixes violations left unfixed ***".PHP_EOL;
                 ob_start();
             }