Merge pull request sebastianbergmann#832 from whatthejeff/issue_830

Author: sebastianbergmann

PHPUnit/Util/XML.php

@@ -65,10 +65,10 @@ class PHPUnit_Util_XML
     public static function prepareString($string)
     {
         return preg_replace_callback(
-          '([\\x00-\\x04\\x0b\\x0c\\x0e-\\x1f\\x7f])',
+          '/[\\x00-\\x04\\x0b\\x0c\\x0e-\\x1f\\x7f]/',
           function ($matches)
           {
-              return sprintf('&#x%02x;', ord($matches[1]));
+              return sprintf('&#x%02x;', ord($matches[0]));
           },
           htmlspecialchars(
             PHPUnit_Util_String::convertToUtf8($string), ENT_COMPAT, 'UTF-8'

Tests/Util/XMLTest.php

@@ -320,4 +320,9 @@ public function testConvertAssertRange()
 
         $this->assertEquals($tag, $converted);
     }
+
+    public function testPrepareStringEscapesChars()
+    {
+        $this->assertEquals('', PHPUnit_Util_XML::prepareString("\033"));
+    }
 }