Skip to content

Commit 4acd8b0

Browse files
Merge branch '3.7'
2 parents 9740a58 + 03d1a18 commit 4acd8b0

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

PHPUnit/Framework/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ public function getActualOutput()
410410
*/
411411
public function hasOutput()
412412
{
413-
if (empty($this->output)) {
413+
if (strlen($this->output) === 0) {
414414
return FALSE;
415415
}
416416

PHPUnit/TextUI/TestRunner.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -471,16 +471,15 @@ class_exists($arguments['printer'], FALSE)) {
471471
$colors = FALSE;
472472
}
473473

474-
$processor = new PHP_CodeCoverage_Report_Text(
474+
$writer = new PHP_CodeCoverage_Report_Text(
475+
$outputStream,
475476
$arguments['reportLowUpperBound'],
476477
$arguments['reportHighLowerBound'],
477478
$arguments['coverageTextShowUncoveredFiles'],
478479
$arguments['coverageTextShowOnlySummary']
479480
);
480481

481-
$outputStream->write(
482-
$processor->process($codeCoverage, $colors)
483-
);
482+
$writer->process($codeCoverage, $colors);
484483
}
485484
}
486485

-156 KB
Binary file not shown.
156 KB
Binary file not shown.

0 commit comments

Comments
 (0)