fix Debug::getEscaper() never called at dump() when xdebug is not loaded

mshilov · Oct 21, 2013 · cb9ef4a · cb9ef4a
1 parent 855cffa
commit cb9ef4a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/library/Zend/Debug/Debug.php b/library/Zend/Debug/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/tests/ZendTest/Debug/DebugTest.php b/tests/ZendTest/Debug/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);
+    }
+
 }