Merge pull request #1062 from PHPCSStandards/phpcs-4.0/feature/sq1612-1010-send-runner-caught-output-to-stderr-stdout

Runner: use StatusWriter for caught errors

Author: jrfnl

src/Runner.php

@@ -126,8 +126,17 @@ public function runPHPCS()
                 Timing::printRunTime();
             }
         } catch (DeepExitException $e) {
-            echo $e->getMessage();
-            return $e->getCode();
+            $exitCode = $e->getCode();
+            $message  = $e->getMessage();
+            if ($message !== '') {
+                if ($exitCode === 0) {
+                    echo $e->getMessage();
+                } else {
+                    StatusWriter::write($e->getMessage(), 0, 0);
+                }
+            }
+
+            return $exitCode;
         }//end try
 
         if ($numErrors === 0) {
@@ -212,8 +221,17 @@ public function runPHPCBF()
                 Timing::printRunTime();
             }
         } catch (DeepExitException $e) {
-            echo $e->getMessage();
-            return $e->getCode();
+            $exitCode = $e->getCode();
+            $message  = $e->getMessage();
+            if ($message !== '') {
+                if ($exitCode === 0) {
+                    echo $e->getMessage();
+                } else {
+                    StatusWriter::write($e->getMessage(), 0, 0);
+                }
+            }
+
+            return $exitCode;
         }//end try
 
         if ($this->reporter->totalFixed === 0) {

tests/Core/Runner/RunAllFilesExcludedErrorTest.php

@@ -10,6 +10,7 @@
 
 use PHP_CodeSniffer\Runner;
 use PHP_CodeSniffer\Tests\Core\Runner\AbstractRunnerTestCase;
+use PHP_CodeSniffer\Tests\Core\StatusWriterTestHelper;
 
 /**
  * Tests for the "All files were excluded" error message.
@@ -18,6 +19,7 @@
  */
 final class RunAllFilesExcludedErrorTest extends AbstractRunnerTestCase
 {
+    use StatusWriterTestHelper;
 
 
     /**
@@ -41,6 +43,8 @@ public function testPhpcs($sourceDir, $extraArgs)
         $runner = new Runner();
         $runner->runPHPCS();
 
+        $this->verifyOutput();
+
     }//end testPhpcs()
 
 
@@ -66,6 +70,8 @@ public function testPhpcbf($sourceDir, $extraArgs)
         $runner = new Runner();
         $runner->runPHPCBF();
 
+        $this->verifyOutput();
+
     }//end testPhpcbf()
 
 
@@ -111,12 +117,24 @@ private function setupTest($sourceDir, $extraArgs)
             $_SERVER['argv'][] = $arg;
         }
 
-        $message  = 'ERROR: No files were checked.'.PHP_EOL;
-        $message .= 'All specified files were excluded or did not match filtering rules.'.PHP_EOL.PHP_EOL;
-
-        $this->expectOutputString($message);
+        $this->expectNoStdoutOutput();
 
     }//end setupTest()
 
 
+    /**
+     * Helper method to verify the output expectation for STDERR.
+     *
+     * @return void
+     */
+    private function verifyOutput()
+    {
+        $expected  = 'ERROR: No files were checked.'.PHP_EOL;
+        $expected .= 'All specified files were excluded or did not match filtering rules.'.PHP_EOL.PHP_EOL;
+
+        $this->assertStderrOutputSameString($expected);
+
+    }//end verifyOutput()
+
+
 }//end class