From c05a5cfc7df7c1700c45e91c75465daaadb6582e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 8 Oct 2013 14:11:31 +0700
Subject: [PATCH 1/5] fix Debug::getEscaper() never called at dump() when
 xdebug is not loaded

---
 src/Debug.php      |  2 +-
 test/DebugTest.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Debug.php b/src/Debug.php
index e20c500..7dfc508 100644
--- a/src/Debug.php
+++ b/src/Debug.php
@@ -104,7 +104,7 @@ public static function dump($var, $label = null, $echo = true)
                     . PHP_EOL . $output
                     . PHP_EOL;
         } else {
-            if (!extension_loaded('xdebug')) {
+            if (!extension_loaded('xdebug') || null !== static::$escaper) {
                 $output = static::getEscaper()->escapeHtml($output);
             }
 
diff --git a/test/DebugTest.php b/test/DebugTest.php
index 36b80c2..3b7ac9f 100644
--- a/test/DebugTest.php
+++ b/test/DebugTest.php
@@ -94,4 +94,14 @@ public function testXdebugEnabledAndNonCliSapiDoesNotEscapeSpecialChars()
         $this->assertContains("</pre>", $result);
     }
 
+    public function testDebugHaveEscaper()
+    {
+        $escaper = new \Zend\Escaper\Escaper;
+        Debug::setEscaper($escaper);
+
+        $a = array("a" => "<script type=\"text/javascript\"");
+        $result = Debug::dump($a, "LABEL", false);
+        $this->assertContains("&lt;script type=&quot;text/javascript&quot;&quot;", $result);
+    }
+
 }

From b89f59574191dfa0064e08253b9d52ae92c317a0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 21 Oct 2013 20:07:32 +0700
Subject: [PATCH 2/5] Import Escaper as use statement

---
 test/DebugTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/DebugTest.php b/test/DebugTest.php
index 3b7ac9f..e20d675 100644
--- a/test/DebugTest.php
+++ b/test/DebugTest.php
@@ -10,6 +10,7 @@
 namespace ZendTest;
 
 use Zend\Debug\Debug;
+use Zend\Escaper\Escaper;
 
 /**
  * @group      Zend_Debug
@@ -96,7 +97,7 @@ public function testXdebugEnabledAndNonCliSapiDoesNotEscapeSpecialChars()
 
     public function testDebugHaveEscaper()
     {
-        $escaper = new \Zend\Escaper\Escaper;
+        $escaper = new Escaper;
         Debug::setEscaper($escaper);
 
         $a = array("a" => "<script type=\"text/javascript\"");

From 005c952630bce4da0e81946407cc53dff2113395 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 21 Oct 2013 20:40:30 +0700
Subject: [PATCH 3/5] fix breaks the lazy load of getEscaper

---
 src/Debug.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Debug.php b/src/Debug.php
index 7dfc508..c2406a5 100644
--- a/src/Debug.php
+++ b/src/Debug.php
@@ -104,7 +104,9 @@ public static function dump($var, $label = null, $echo = true)
                     . PHP_EOL . $output
                     . PHP_EOL;
         } else {
-            if (!extension_loaded('xdebug') || null !== static::$escaper) {
+            if (null !== static::$escaper) {
+                $output = static::$escaper->escapeHtml($output);    
+            } else if (!extension_loaded('xdebug')) {
                 $output = static::getEscaper()->escapeHtml($output);
             }
 

From 9f5cb7d4bb804c82750454b4bcea13bb311b6120 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 22 Oct 2013 03:58:03 +0700
Subject: [PATCH 4/5] fix cs

---
 src/Debug.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Debug.php b/src/Debug.php
index c2406a5..0f8aac2 100644
--- a/src/Debug.php
+++ b/src/Debug.php
@@ -105,8 +105,8 @@ public static function dump($var, $label = null, $echo = true)
                     . PHP_EOL;
         } else {
             if (null !== static::$escaper) {
-                $output = static::$escaper->escapeHtml($output);    
-            } else if (!extension_loaded('xdebug')) {
+                $output = static::$escaper->escapeHtml($output);
+            } elseif (!extension_loaded('xdebug')) {
                 $output = static::getEscaper()->escapeHtml($output);
             }
 

From 335aab7909409a8edb4b3b2aeeaee2b089783090 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 24 Oct 2013 00:40:54 +0700
Subject: [PATCH 5/5] added require-dev to composer.json at Zend\Debug

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a9d0892..3e46a99 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "zendframework/zend-escaper": "2.*",
+        "zendframework/zend-escaper": "*",
         "fabpot/php-cs-fixer": "1.7.*",
         "satooshi/php-coveralls": "dev-master",
         "phpunit/PHPUnit": "~4.0"