Merge branch '3.7'

brobie · Dec 10, 2012 · 6b80404 · 6b80404
2 parents b2652e9 + b3e92b2
commit 6b80404
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/PHPUnit/Util/XML.php b/PHPUnit/Util/XML.php
@@ -64,9 +64,12 @@ class PHPUnit_Util_XML
      */
     public static function prepareString($string)
     {
-        return preg_replace(
-          '([\\x00-\\x04\\x0b\\x0c\\x0e-\\x1f\\x7f])e',
-          'sprintf( "&#x%02x;", ord( "\\1" ) )',
+        return preg_replace_callback(
+          '([\\x00-\\x04\\x0b\\x0c\\x0e-\\x1f\\x7f])',
+          function ($matches)
+          {
+              return sprintf('&#x%02x;', ord($matches[1]));
+          },
           htmlspecialchars(
             PHPUnit_Util_String::convertToUtf8($string), ENT_COMPAT, 'UTF-8'
           )

diff --git a/build/dependencies/PHP_CodeCoverage-1.2.6.tgz b/build/dependencies/PHP_CodeCoverage-1.2.6.tgz
diff --git a/build/dependencies/PHP_CodeCoverage-1.2.7.tgz b/build/dependencies/PHP_CodeCoverage-1.2.7.tgz