Merge branch 'hotfix/5240' into develop

Forward port zendframework/zendframework#5240

composer.json

@@ -13,11 +13,10 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
-        "zendframework/zend-escaper": "self.version"
+        "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"

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')) {
+            if (null !== static::$escaper) {
+                $output = static::$escaper->escapeHtml($output);
+            } elseif (!extension_loaded('xdebug')) {
                 $output = static::getEscaper()->escapeHtml($output);
             }
 

test/DebugTest.php

@@ -10,6 +10,7 @@
 namespace ZendTest;
 
 use Zend\Debug\Debug;
+use Zend\Escaper\Escaper;
 
 /**
  * @group      Zend_Debug
@@ -94,4 +95,14 @@ public function testXdebugEnabledAndNonCliSapiDoesNotEscapeSpecialChars()
         $this->assertContains("</pre>", $result);
     }
 
+    public function testDebugHaveEscaper()
+    {
+        $escaper = new 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);
+    }
+
 }