Merge branch '4.2'

src/Util/PHP.php

@@ -154,7 +154,7 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew
 
             if ($childResult !== false) {
                 if (!empty($childResult['output'])) {
-                    print $childResult['output'];
+                    $output = $childResult['output'];
                 }
 
                 $test->setResult($childResult['testResult']);
@@ -200,6 +200,10 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew
         }
 
         $result->endTest($test, $time);
+
+        if (!empty($output)) {
+            print $output;
+        }
     }
 
     /**

src/Util/PHP/Template/TestCaseMethod.tpl.dist

@@ -37,9 +37,8 @@ function __phpunit_run_isolated_test()
     $test->setInIsolation(TRUE);
 
     ob_end_clean();
-    ob_start();
     $test->run($result);
-    $output = ob_get_clean();
+    $output = $test->getActualOutput();
 
     print serialize(
       array(

tests/Regression/GitHub/1149.phpt

@@ -0,0 +1,20 @@
+--TEST--
+GH-1149: Test swallows output buffer when run in a separate process
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1149Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1149/Issue1149Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.1.2
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)

tests/Regression/GitHub/1149/Issue1149Test.php

@@ -0,0 +1,18 @@
+<?php
+class Issue1149Test extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        $this->assertTrue(true);
+        print '1';
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testTwo()
+    {
+        $this->assertTrue(true);
+        print '2';
+    }
+}