Fix --stderr with --tap or --testdox options

sebastianbergmann · Dec 19, 2014 · ea1fea3 · ea1fea3
1 parent 980444a
commit ea1fea3
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -470,12 +470,12 @@ protected function handleArguments(array $argv)
                 break;
 
                 case '--tap': {
-                    $this->arguments['printer'] = new PHPUnit_Util_Log_TAP;
+                    $this->arguments['printer'] = 'PHPUnit_Util_Log_TAP';
                     }
                 break;
 
                 case '--testdox': {
-                    $this->arguments['printer'] = new PHPUnit_Util_TestDox_ResultPrinter_Text;
+                    $this->arguments['printer'] = 'PHPUnit_Util_TestDox_ResultPrinter_Text';
                     }
                 break;
 
@@ -604,11 +604,6 @@ protected function handleArguments(array $argv)
             );
         }
 
-        if (isset($this->arguments['printer']) &&
-            is_string($this->arguments['printer'])) {
-            $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
-        }
-
         if ($this->arguments['loader'] !== null) {
             $this->arguments['loader'] = $this->handleLoader($this->arguments['loader']);
         }
@@ -664,11 +659,8 @@ protected function handleArguments(array $argv)
             /**
              * Issue #657
              */
-            if (isset($phpunit['stderr']) && $phpunit['stderr'] == true) {
-                $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter(
-                    'php://stderr',
-                    isset($this->arguments['verbose']) ? $this->arguments['verbose'] : false
-                );
+            if (isset($phpunit['stderr']) && ! isset($this->arguments['stderr'])) {
+                $this->arguments['stderr'] = $phpunit['stderr'];
             }
 
             if (isset($phpunit['printerClass'])) {
@@ -713,6 +705,11 @@ class_exists('PHPUnit_Extensions_SeleniumTestCase')) {
             $this->handleBootstrap($this->arguments['bootstrap']);
         }
 
+        if (isset($this->arguments['printer']) &&
+            is_string($this->arguments['printer'])) {
+            $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
+        }
+
         if (isset($this->arguments['test']) && is_string($this->arguments['test']) && substr($this->arguments['test'], -5, 5) == '.phpt') {
             $test = new PHPUnit_Extensions_PhptTestCase($this->arguments['test']);
 
@@ -804,7 +801,9 @@ protected function handlePrinter($printerClass, $printerFile = '')
                     return $printerClass;
                 }
 
-                return $class->newInstance();
+                $outputStream = isset($this->arguments['stderr']) ? 'php://stderr' : null;
+
+                return $class->newInstance($outputStream);
             }
         }