From 1a1b63266c046e1856fd03812a4e0ac2b51aa2d5 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sebastian@thephp.cc>
Date: Mon, 14 Mar 2016 16:10:21 +0100
Subject: [PATCH] Closes #2112

---
 ChangeLog-4.8.md          | 7 +++++++
 src/TextUI/TestRunner.php | 2 +-
 src/Util/Printer.php      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog-4.8.md b/ChangeLog-4.8.md
index 9d431870dd1..b3eee076bb8 100644
--- a/ChangeLog-4.8.md
+++ b/ChangeLog-4.8.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.8.25] - 2016-MM-DD
+
+### Fixed
+
+* Fixed [#2112](https://github.com/sebastianbergmann/phpunit/issues/2112): Output is html entity encoded when ran through `phpdbg`
+
 ## [4.8.24] - 2016-03-14
 
 ### Fixed
@@ -177,6 +183,7 @@ New PHAR release due to updated dependencies
 * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
 * Changed the name of the default group from `__nogroup__` to `default`
 
+[4.8.25]: https://github.com/sebastianbergmann/phpunit/compare/4.8.24...4.8.25
 [4.8.24]: https://github.com/sebastianbergmann/phpunit/compare/4.8.23...4.8.24
 [4.8.23]: https://github.com/sebastianbergmann/phpunit/compare/4.8.22...4.8.23
 [4.8.22]: https://github.com/sebastianbergmann/phpunit/compare/4.8.21...4.8.22
diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
index 716486121d7..bb07ea7e8b3 100644
--- a/src/TextUI/TestRunner.php
+++ b/src/TextUI/TestRunner.php
@@ -597,7 +597,7 @@ protected function runFailed($message)
      */
     protected function write($buffer)
     {
-        if (PHP_SAPI != 'cli') {
+        if (PHP_SAPI != 'cli' && PHP_SAPI != 'phpdbg') {
             $buffer = htmlspecialchars($buffer);
         }
 
diff --git a/src/Util/Printer.php b/src/Util/Printer.php
index 9ff7daac824..d2ab41eb8f4 100644
--- a/src/Util/Printer.php
+++ b/src/Util/Printer.php
@@ -127,7 +127,7 @@ public function write($buffer)
                 $this->incrementalFlush();
             }
         } else {
-            if (PHP_SAPI != 'cli') {
+            if (PHP_SAPI != 'cli' && PHP_SAPI != 'phpdbg') {
                 $buffer = htmlspecialchars($buffer);
             }