Correct fix for #1956

bwoebi · bwoebi · commit 284a69fb88a2 · 2016-11-13T18:52:50.000+01:00
diff --git a/src/Util/PHP/Template/TestCaseMethod.tpl.dist b/src/Util/PHP/Template/TestCaseMethod.tpl.dist
@@ -55,7 +55,7 @@ function __phpunit_run_isolated_test()
         $output = $test->getActualOutput();
     }
 
-    rewind(STDOUT);
+    @rewind(STDOUT); /* @ as not every STDOUT target stream is rewindable */
     if ($stdout = stream_get_contents(STDOUT)) {
         $output = $stdout . $output;
     }
diff --git a/src/Util/PHP/eval-stdin.php b/src/Util/PHP/eval-stdin.php
@@ -1,3 +1,3 @@
 <?php
 
-eval('?>' . file_get_contents('php://input'));
+eval('?>' . file_get_contents('php://stdin'));

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function __phpunit_run_isolated_test()`
`55`	`55`	`$output = $test->getActualOutput();`
`56`	`56`	`}`
`57`	`57`
`58`		`- rewind(STDOUT);`
	`58`	`+ @rewind(STDOUT); /* @ as not every STDOUT target stream is rewindable */`
`59`	`59`	`if ($stdout = stream_get_contents(STDOUT)) {`
`60`	`60`	`$output = $stdout . $output;`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-eval('?>' . file_get_contents('php://input'));`
	`3`	`+eval('?>' . file_get_contents('php://stdin'));`