Addressed UTF-8 encoding issues.

Neither iconv nor mb seem to be able to convert UTF-8 surrogates
into UTF-8. As I understand it, this is an extreme edge case.
Still, the behavior in both cases is that the surrogates are
stripped from the string. We test for that condition, now.

3 files changed, 291 insertions, 286 deletions

diff --git a/src/HTML5/Parser/StringInputStream.php b/src/HTML5/Parser/StringInputStream.php
index 5f41c21..9aa0b73 100644
--- a/src/HTML5/Parser/StringInputStream.php
+++ b/src/HTML5/Parser/StringInputStream.php
@@ -62,17 +62,18 @@ class StringInputStream implements InputStream {
    *
    * @param $data Data to parse
    */
-  public function __construct($data, $encoding = 'UTF-8') {
+  public function __construct($data, $encoding = 'UTF-8', $debug = '') {
 
-    $data = $this->convertToUTF8($data, $encoding);
+    $data = UTF8Utils::convertToUTF8($data, $encoding);
+    if ($debug) fprintf(STDOUT, $debug, $data, strlen($data));
 
     // There is good reason to question whether it makes sense to
     // do this here, since most of these checks are done during
     // parsing, and since this check doesn't actually *do* anything.
-    $e = UTF8Utils::checkForIllegalCodepoints($data);
-    if (!empty($e)) {
-      throw new ParseError("UTF-8 encoding issues: " . implode(', ', $e));
-    }
+    $this->errors = UTF8Utils::checkForIllegalCodepoints($data);
+    //if (!empty($e)) {
+    //  throw new ParseError("UTF-8 encoding issues: " . implode(', ', $e));
+    //}
 
     $data = $this->replaceLinefeeds($data);
 
@@ -82,63 +83,6 @@ class StringInputStream implements InputStream {
   }
 
   /**
-   * Convert data from the given encoding to UTF-8.
-   *
-   * This has not yet been tested with charactersets other than UTF-8. 
-   * It should work with ISO-8859-1/-13 and standard Latin Win charsets.
-   *
-   * @param string $data
-   *   The data to convert.
-   * @param string $encoding
-   *   A valid encoding. Examples: http://www.php.net/manual/en/mbstring.supported-encodings.php
-   */
-  protected function convertToUTF8($data, $encoding = 'UTF-8') {
-    /* Given an encoding, the bytes in the input stream must be
-    converted to Unicode characters for the tokeniser, as
-    described by the rules for that encoding, except that the
-    leading U+FEFF BYTE ORDER MARK character, if any, must not
-    be stripped by the encoding layer (it is stripped by the rule below).
-
-    Bytes or sequences of bytes in the original byte stream that
-    could not be converted to Unicode characters must be converted
-    to U+FFFD REPLACEMENT CHARACTER code points. */
-
-    // XXX currently assuming input data is UTF-8; once we
-    // build encoding detection this will no longer be the case
-    //
-    // We previously had an mbstring implementation here, but that
-    // implementation is heavily non-conforming, so it's been
-    // omitted.
-    if (function_exists('iconv') && $encoding != 'auto') {
-      // iconv has the following behaviors:
-      // - Overlong representations are ignored.
-      // - Beyond Plane 16 is replaced with a lower char.
-      // - Incomplete sequences generate a warning.
-      $data = @iconv($encoding, 'UTF-8//IGNORE', $data);
-    }
-    // MPB: Testing the newer mb_convert_encoding(). This might need
-    // to be removed again.
-    elseif (function_exists('mb_convert_encoding')) {
-      // mb library has the following behaviors:
-      // - UTF-16 surrogates result in FALSE.
-      // - Overlongs and outside Plane 16 result in empty strings.
-      $data = mb_convert_encoding($data, 'UTF-8', $encoding);
-    }
-    else {
-      // we can make a conforming native implementation
-      throw new Exception('Not implemented, please install mbstring or iconv');
-    }
-
-    /* One leading U+FEFF BYTE ORDER MARK character must be
-    ignored if any are present. */
-    if (substr($data, 0, 3) === "\xEF\xBB\xBF") {
-      $data = substr($data, 3);
-    }
-
-    return $data;
-  }
-
-  /**
    * Replace linefeed characters according to the spec.
    */
   protected function replaceLinefeeds($data) {
@@ -158,62 +102,6 @@ class StringInputStream implements InputStream {
   }
 
   /**
-   * Checks for Unicode code points that are not valid in a document.
-   *
-   * This stores a parse error for each error that is found.
-   */
-  protected function checkForIllegalCodepoints($data) {
-    if (!function_exists('preg_match_all')) {
-      throw \Exception('The PCRE library is not loaded or is not available.');
-    }
-
-    /* All U+0000 NULL characters in the input must be replaced
-    by U+FFFD REPLACEMENT CHARACTERs. Any occurrences of such
-    characters is a parse error. */
-    for ($i = 0, $count = substr_count($data, "\0"); $i < $count; $i++) {
-      $this->errors[] = array(
-        'type' => Tokenizer::PARSEERROR,
-        'data' => 'null-character'
-      );
-    }
-
-    /* Any occurrences of any characters in the ranges U+0001 to
-    U+0008, U+000B,  U+000E to U+001F,  U+007F  to U+009F,
-    U+D800 to U+DFFF , U+FDD0 to U+FDEF, and
-    characters U+FFFE, U+FFFF, U+1FFFE, U+1FFFF, U+2FFFE, U+2FFFF,
-    U+3FFFE, U+3FFFF, U+4FFFE, U+4FFFF, U+5FFFE, U+5FFFF, U+6FFFE,
-    U+6FFFF, U+7FFFE, U+7FFFF, U+8FFFE, U+8FFFF, U+9FFFE, U+9FFFF,
-    U+AFFFE, U+AFFFF, U+BFFFE, U+BFFFF, U+CFFFE, U+CFFFF, U+DFFFE,
-    U+DFFFF, U+EFFFE, U+EFFFF, U+FFFFE, U+FFFFF, U+10FFFE, and
-    U+10FFFF are parse errors. (These are all control characters
-    or permanently undefined Unicode characters.) */
-    // Check PCRE is loaded.
-    $count = preg_match_all(
-      '/(?:
-        [\x01-\x08\x0B\x0E-\x1F\x7F] # U+0001 to U+0008, U+000B,  U+000E to U+001F and U+007F
-      |
-        \xC2[\x80-\x9F] # U+0080 to U+009F
-      |
-        \xED(?:\xA0[\x80-\xFF]|[\xA1-\xBE][\x00-\xFF]|\xBF[\x00-\xBF]) # U+D800 to U+DFFFF
-      |
-        \xEF\xB7[\x90-\xAF] # U+FDD0 to U+FDEF
-      |
-        \xEF\xBF[\xBE\xBF] # U+FFFE and U+FFFF
-      |
-        [\xF0-\xF4][\x8F-\xBF]\xBF[\xBE\xBF] # U+nFFFE and U+nFFFF (1 <= n <= 10_{16})
-      )/x',
-      $data,
-      $matches
-    );
-    for ($i = 0; $i < $count; $i++) {
-      $this->errors[] = array(
-        'type' => Tokenizer::PARSEERROR,
-        'data' => 'invalid-codepoint'
-      );
-    }
-  }
-
-  /**
    * Returns the current line that the tokenizer is at.
    */
   public function currentLine() {
@@ -319,6 +207,10 @@ class StringInputStream implements InputStream {
    * end of the file.
    *
    * @note This performs bounds checking
+   *
+   * @return string
+   *   Returns the remaining text. If called when the InputStream is
+   *   already exhausted, it returns an empty string.
    */
   public function remainingChars() {
     if ($this->char < $this->EOF) {
@@ -326,7 +218,7 @@ class StringInputStream implements InputStream {
       $this->char = $this->EOF;
       return $data;
     }
-    return FALSE;
+    return '';//FALSE;
   }
 
   /**
diff --git a/src/HTML5/Parser/UTF8Utils.php b/src/HTML5/Parser/UTF8Utils.php
index 0902050..0d692d1 100644
--- a/src/HTML5/Parser/UTF8Utils.php
+++ b/src/HTML5/Parser/UTF8Utils.php
@@ -1,4 +1,30 @@
 <?php
+/*
+ *
+ * Portions based on code from html5lib files with the following copyright:
+
+Copyright 2009 Geoffrey Sneddon <http://gsnedders.com/>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
 namespace HTML5\Parser;
 /**
  * UTF-8 Utilities
@@ -33,6 +59,61 @@ class UTF8Utils {
   }
 
   /**
+   * Convert data from the given encoding to UTF-8.
+   *
+   * This has not yet been tested with charactersets other than UTF-8. 
+   * It should work with ISO-8859-1/-13 and standard Latin Win charsets.
+   *
+   * @param string $data
+   *   The data to convert.
+   * @param string $encoding
+   *   A valid encoding. Examples: http://www.php.net/manual/en/mbstring.supported-encodings.php
+   */
+  public static function convertToUTF8($data, $encoding = 'UTF-8') {
+    /*
+     * From the HTML5 spec:
+    Given an encoding, the bytes in the input stream must be
+    converted to Unicode characters for the tokeniser, as
+    described by the rules for that encoding, except that the
+    leading U+FEFF BYTE ORDER MARK character, if any, must not
+    be stripped by the encoding layer (it is stripped by the rule below).
+
+    Bytes or sequences of bytes in the original byte stream that
+    could not be converted to Unicode characters must be converted
+    to U+FFFD REPLACEMENT CHARACTER code points. */
+
+    if (function_exists('iconv') && $encoding != 'auto') {
+      // fprintf(STDOUT, "iconv found\n");
+      // iconv has the following behaviors:
+      // - Overlong representations are ignored.
+      // - Beyond Plane 16 is replaced with a lower char.
+      // - Incomplete sequences generate a warning.
+      $data = @iconv($encoding, 'UTF-8//IGNORE', $data);
+    }
+    // MPB: Testing the newer mb_convert_encoding(). This might need
+    // to be removed again.
+    elseif (function_exists('mb_convert_encoding')) {
+      fprintf(STDOUT, "MB found\n");
+      // mb library has the following behaviors:
+      // - UTF-16 surrogates result in FALSE.
+      // - Overlongs and outside Plane 16 result in empty strings.
+      $data = mb_convert_encoding($data, 'UTF-8', $encoding);
+    }
+    else {
+      // we can make a conforming native implementation
+      throw new Exception('Not implemented, please install mbstring or iconv');
+    }
+
+    /* One leading U+FEFF BYTE ORDER MARK character must be
+    ignored if any are present. */
+    if (substr($data, 0, 3) === "\xEF\xBB\xBF") {
+      $data = substr($data, 3);
+    }
+
+    return $data;
+  }
+
+  /**
    * Checks for Unicode code points that are not valid in a document.
    *
    * @param string $data
@@ -84,7 +165,7 @@ class UTF8Utils {
       $matches
     );
     for ($i = 0; $i < $count; $i++) {
-      $this[] =  'invalid-codepoint';
+      $errors[] =  'invalid-codepoint';
     }
     return $errors;
   }
diff --git a/test/HTML5/Parser/StringInputStreamTest.php b/test/HTML5/Parser/StringInputStreamTest.php
index 8e2b115..f47de4f 100644
--- a/test/HTML5/Parser/StringInputStreamTest.php
+++ b/test/HTML5/Parser/StringInputStreamTest.php
@@ -163,174 +163,206 @@ class InputStreamTest extends \HTML5\Tests\TestCase {
     $this->assertEquals('a', $leading->current(), 'BOM should be stripped');
   }
 
-  // public function testCarriageReturn() {
-
-  //   // Replace NULL with Unicode replacement.
-  //   $stream = new StringInputStream("\0\0\0");
-  //   $this->assertEquals("\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD", $stream->remainingChars(), 'Null character should be replaced by U+FFFD');
-  //   $this->assertEquals(3, count($stream->errors), 'Null character should set parse error: ' . print_r($stream->errors, TRUE));
-
-  //   // Remove CR when next to LF.
-  //   $stream = new StringInputStream("\r\n");
-  //   $this->assertEquals("\n", $stream->remainingChars(), 'CRLF should be replaced by LF');
-
-  //   // Convert CR to LF when on its own.
-  //   $stream = new StringInputStream("\r");
-  //   $this->assertEquals("\n", $stream->remainingChars(), 'CR should be replaced by LF');
-  // }
-
-
-  // public function invalidParseErrorTestHandler($input, $numErrors, $name) {
-  //   $stream = new StringInputStream($input);
-  //   $this->assertEquals($input, $stream->remainingChars(), $name . ' (stream content)');
-  //   $this->assertEquals($numErrors, count($stream->errors), $name . ' (number of errors)');
-  // }
-
-  // public function testInvalidReplace() {
-  //   $invalidTest = array(
-
-  //     // Min/max overlong
-  //     "\xC0\x80a" => 'Overlong representation of U+0000',
-  //     "\xE0\x80\x80a" => 'Overlong representation of U+0000',
-  //     "\xF0\x80\x80\x80a" => 'Overlong representation of U+0000',
-  //     "\xF8\x80\x80\x80\x80a" => 'Overlong representation of U+0000',
-  //     "\xFC\x80\x80\x80\x80\x80a" => 'Overlong representation of U+0000',
-  //     "\xC1\xBFa" => 'Overlong representation of U+007F',
-  //     "\xE0\x9F\xBFa" => 'Overlong representation of U+07FF',
-  //     "\xF0\x8F\xBF\xBFa" => 'Overlong representation of U+FFFF',
-
-
-  //     "a\xDF" => 'Incomplete two byte sequence (missing final byte)',
-  //     "a\xEF\xBF" => 'Incomplete three byte sequence (missing final byte)',
-  //     "a\xF4\xBF\xBF" => 'Incomplete four byte sequence (missing final byte)',
-
-  //     // Min/max continuation bytes
-  //     "a\x80" => 'Lone 80 continuation byte',
-  //     "a\xBF" => 'Lone BF continuation byte',
-
-  //     // Invalid bytes (these can never occur)
-  //     "a\xFE" => 'Invalid FE byte',
-  //     "a\xFF" => 'Invalid FF byte',
-  //   );
-  //   foreach ($invalidTest as $test => $note) {
-  //     $stream = new StringInputStream($test);
-  //     $this->assertEquals('a', $stream->remainingChars(), $note);
-  //   }
-
-  //   // MPB:
-  //   // It appears that iconv just leaves these alone. Not sure what to 
-  //   // do.
-  //   /*
-  //   $converted = array(
-  //     "a\xF5\x90\x80\x80" => 'U+110000, off unicode planes.',
-  //   );
-  //   foreach ($converted as $test => $note) {
-  //     $stream = new StringInputStream($test);
-  //     $this->assertEquals(2, mb_strlen($stream->remainingChars()), $note);
-  //   }
-  //    */
-  // }
-
-  // public function testInvalidParseError() {
-  //   // C0 controls (except U+0000 and U+000D due to different handling)
-  //   $this->invalidParseErrorTestHandler("\x01", 1, 'U+0001 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x02", 1, 'U+0002 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x03", 1, 'U+0003 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x04", 1, 'U+0004 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x05", 1, 'U+0005 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x06", 1, 'U+0006 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x07", 1, 'U+0007 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x08", 1, 'U+0008 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x09", 0, 'U+0009 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x0A", 0, 'U+000A (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x0B", 1, 'U+000B (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x0C", 0, 'U+000C (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x0E", 1, 'U+000E (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x0F", 1, 'U+000F (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x10", 1, 'U+0010 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x11", 1, 'U+0011 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x12", 1, 'U+0012 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x13", 1, 'U+0013 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x14", 1, 'U+0014 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x15", 1, 'U+0015 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x16", 1, 'U+0016 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x17", 1, 'U+0017 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x18", 1, 'U+0018 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x19", 1, 'U+0019 (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x1A", 1, 'U+001A (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x1B", 1, 'U+001B (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x1C", 1, 'U+001C (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x1D", 1, 'U+001D (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x1E", 1, 'U+001E (C0 control)');
-  //   $this->invalidParseErrorTestHandler("\x1F", 1, 'U+001F (C0 control)');
-    
-  //   // DEL (U+007F)
-  //   $this->invalidParseErrorTestHandler("\x7F", 1, 'U+007F');
+  public function testCarriageReturn() {
+
+    // Replace NULL with Unicode replacement.
+    $stream = new StringInputStream("\0\0\0");
+    $this->assertEquals("\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD", $stream->remainingChars(), 'Null character should be replaced by U+FFFD');
+    $this->assertEquals(3, count($stream->errors), 'Null character should set parse error: ' . print_r($stream->errors, TRUE));
+
+    // Remove CR when next to LF.
+    $stream = new StringInputStream("\r\n");
+    $this->assertEquals("\n", $stream->remainingChars(), 'CRLF should be replaced by LF');
+
+   // Convert CR to LF when on its own.
+   $stream = new StringInputStream("\r");
+   $this->assertEquals("\n", $stream->remainingChars(), 'CR should be replaced by LF');
+  }
+
+
+  public function invalidParseErrorTestHandler($input, $numErrors, $name) {
+    $stream = new StringInputStream($input, 'UTF-8');
+    $this->assertEquals($input, $stream->remainingChars(), $name . ' (stream content)');
+    $this->assertEquals($numErrors, count($stream->errors), $name . ' (number of errors)');
+  }
+
+  public function testInvalidReplace() {
+     $invalidTest = array(
+
+       // Min/max overlong
+       "\xC0\x80a" => 'Overlong representation of U+0000',
+       "\xE0\x80\x80a" => 'Overlong representation of U+0000',
+       "\xF0\x80\x80\x80a" => 'Overlong representation of U+0000',
+       "\xF8\x80\x80\x80\x80a" => 'Overlong representation of U+0000',
+       "\xFC\x80\x80\x80\x80\x80a" => 'Overlong representation of U+0000',
+       "\xC1\xBFa" => 'Overlong representation of U+007F',
+       "\xE0\x9F\xBFa" => 'Overlong representation of U+07FF',
+       "\xF0\x8F\xBF\xBFa" => 'Overlong representation of U+FFFF',
+
+
+       "a\xDF" => 'Incomplete two byte sequence (missing final byte)',
+       "a\xEF\xBF" => 'Incomplete three byte sequence (missing final byte)',
+       "a\xF4\xBF\xBF" => 'Incomplete four byte sequence (missing final byte)',
+
+       // Min/max continuation bytes
+       "a\x80" => 'Lone 80 continuation byte',
+       "a\xBF" => 'Lone BF continuation byte',
+
+       // Invalid bytes (these can never occur)
+       "a\xFE" => 'Invalid FE byte',
+       "a\xFF" => 'Invalid FF byte',
+     );
+     foreach ($invalidTest as $test => $note) {
+       $stream = new StringInputStream($test);
+       $this->assertEquals('a', $stream->remainingChars(), $note);
+     }
+
+     // MPB:
+     // It appears that iconv just leaves these alone. Not sure what to 
+     // do.
+     /*
+     $converted = array(
+       "a\xF5\x90\x80\x80" => 'U+110000, off unicode planes.',
+     );
+     foreach ($converted as $test => $note) {
+       $stream = new StringInputStream($test);
+       $this->assertEquals(2, mb_strlen($stream->remainingChars()), $note);
+     }
+      */
+   }
+
+   public function testInvalidParseError() {
+     // C0 controls (except U+0000 and U+000D due to different handling)
+     $this->invalidParseErrorTestHandler("\x01", 1, 'U+0001 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x02", 1, 'U+0002 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x03", 1, 'U+0003 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x04", 1, 'U+0004 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x05", 1, 'U+0005 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x06", 1, 'U+0006 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x07", 1, 'U+0007 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x08", 1, 'U+0008 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x09", 0, 'U+0009 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x0A", 0, 'U+000A (C0 control)');
+     $this->invalidParseErrorTestHandler("\x0B", 1, 'U+000B (C0 control)');
+     $this->invalidParseErrorTestHandler("\x0C", 0, 'U+000C (C0 control)');
+     $this->invalidParseErrorTestHandler("\x0E", 1, 'U+000E (C0 control)');
+     $this->invalidParseErrorTestHandler("\x0F", 1, 'U+000F (C0 control)');
+     $this->invalidParseErrorTestHandler("\x10", 1, 'U+0010 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x11", 1, 'U+0011 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x12", 1, 'U+0012 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x13", 1, 'U+0013 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x14", 1, 'U+0014 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x15", 1, 'U+0015 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x16", 1, 'U+0016 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x17", 1, 'U+0017 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x18", 1, 'U+0018 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x19", 1, 'U+0019 (C0 control)');
+     $this->invalidParseErrorTestHandler("\x1A", 1, 'U+001A (C0 control)');
+     $this->invalidParseErrorTestHandler("\x1B", 1, 'U+001B (C0 control)');
+     $this->invalidParseErrorTestHandler("\x1C", 1, 'U+001C (C0 control)');
+     $this->invalidParseErrorTestHandler("\x1D", 1, 'U+001D (C0 control)');
+     $this->invalidParseErrorTestHandler("\x1E", 1, 'U+001E (C0 control)');
+     $this->invalidParseErrorTestHandler("\x1F", 1, 'U+001F (C0 control)');
     
-  //   // C1 Controls
-  //   $this->invalidParseErrorTestHandler("\xC2\x80", 1, 'U+0080 (C1 control)');
-  //   $this->invalidParseErrorTestHandler("\xC2\x9F", 1, 'U+009F (C1 control)');
-  //   $this->invalidParseErrorTestHandler("\xC2\xA0", 0, 'U+00A0 (first codepoint above highest C1 control)');
+     // DEL (U+007F)
+     $this->invalidParseErrorTestHandler("\x7F", 1, 'U+007F');
     
-  //   // Single UTF-16 surrogates
-  //   $this->invalidParseErrorTestHandler("\xED\xA0\x80", 1, 'U+D800 (UTF-16 surrogate character)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAD\xBF", 1, 'U+DB7F (UTF-16 surrogate character)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAE\x80", 1, 'U+DB80 (UTF-16 surrogate character)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAF\xBF", 1, 'U+DBFF (UTF-16 surrogate character)');
-  //   $this->invalidParseErrorTestHandler("\xED\xB0\x80", 1, 'U+DC00 (UTF-16 surrogate character)');
-  //   $this->invalidParseErrorTestHandler("\xED\xBE\x80", 1, 'U+DF80 (UTF-16 surrogate character)');
-  //   $this->invalidParseErrorTestHandler("\xED\xBF\xBF", 1, 'U+DFFF (UTF-16 surrogate character)');
+     // C1 Controls
+     $this->invalidParseErrorTestHandler("\xC2\x80", 1, 'U+0080 (C1 control)');
+     $this->invalidParseErrorTestHandler("\xC2\x9F", 1, 'U+009F (C1 control)');
+     $this->invalidParseErrorTestHandler("\xC2\xA0", 0, 'U+00A0 (first codepoint above highest C1 control)');
     
-  //   // Paired UTF-16 surrogates
-  //   $this->invalidParseErrorTestHandler("\xED\xA0\x80\xED\xB0\x80", 2, 'U+D800 U+DC00 (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xA0\x80\xED\xBF\xBF", 2, 'U+D800 U+DFFF (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAD\xBF\xED\xB0\x80", 2, 'U+DB7F U+DC00 (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAD\xBF\xED\xBF\xBF", 2, 'U+DB7F U+DFFF (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAE\x80\xED\xB0\x80", 2, 'U+DB80 U+DC00 (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAE\x80\xED\xBF\xBF", 2, 'U+DB80 U+DFFF (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAF\xBF\xED\xB0\x80", 2, 'U+DBFF U+DC00 (paired UTF-16 surrogates)');
-  //   $this->invalidParseErrorTestHandler("\xED\xAF\xBF\xED\xBF\xBF", 2, 'U+DBFF U+DFFF (paired UTF-16 surrogates)');
+     // Charcters surrounding surrogates
+     $this->invalidParseErrorTestHandler("\xED\x9F\xBF", 0, 'U+D7FF (one codepoint below lowest surrogate codepoint)');
+     $this->invalidParseErrorTestHandler("\xEF\xBF\xBD", 0, 'U+DE00 (one codepoint above highest surrogate codepoint)');
     
-  //   // Charcters surrounding surrogates
-  //   $this->invalidParseErrorTestHandler("\xED\x9F\xBF", 0, 'U+D7FF (one codepoint below lowest surrogate codepoint)');
-  //   $this->invalidParseErrorTestHandler("\xEF\xBF\xBD", 0, 'U+DE00 (one codepoint above highest surrogate codepoint)');
+     // Permanent noncharacters
+     $this->invalidParseErrorTestHandler("\xEF\xB7\x90", 1, 'U+FDD0 (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xEF\xB7\xAF", 1, 'U+FDEF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xEF\xBF\xBE", 1, 'U+FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xEF\xBF\xBF", 1, 'U+FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF0\x9F\xBF\xBE", 1, 'U+1FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF0\x9F\xBF\xBF", 1, 'U+1FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF0\xAF\xBF\xBE", 1, 'U+2FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF0\xAF\xBF\xBF", 1, 'U+2FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF0\xBF\xBF\xBE", 1, 'U+3FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF0\xBF\xBF\xBF", 1, 'U+3FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\x8F\xBF\xBE", 1, 'U+4FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\x8F\xBF\xBF", 1, 'U+4FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\x9F\xBF\xBE", 1, 'U+5FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\x9F\xBF\xBF", 1, 'U+5FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\xAF\xBF\xBE", 1, 'U+6FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\xAF\xBF\xBF", 1, 'U+6FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\xBF\xBF\xBE", 1, 'U+7FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF1\xBF\xBF\xBF", 1, 'U+7FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\x8F\xBF\xBE", 1, 'U+8FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\x8F\xBF\xBF", 1, 'U+8FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\x9F\xBF\xBE", 1, 'U+9FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\x9F\xBF\xBF", 1, 'U+9FFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\xAF\xBF\xBE", 1, 'U+AFFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\xAF\xBF\xBF", 1, 'U+AFFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\xBF\xBF\xBE", 1, 'U+BFFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF2\xBF\xBF\xBF", 1, 'U+BFFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\x8F\xBF\xBE", 1, 'U+CFFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\x8F\xBF\xBF", 1, 'U+CFFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\x9F\xBF\xBE", 1, 'U+DFFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\x9F\xBF\xBF", 1, 'U+DFFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\xAF\xBF\xBE", 1, 'U+EFFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\xAF\xBF\xBF", 1, 'U+EFFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\xBF\xBF\xBE", 1, 'U+FFFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF3\xBF\xBF\xBF", 1, 'U+FFFFF (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF4\x8F\xBF\xBE", 1, 'U+10FFFE (permanent noncharacter)');
+     $this->invalidParseErrorTestHandler("\xF4\x8F\xBF\xBF", 1, 'U+10FFFF (permanent noncharacter)');
+
+     // MPB: All of these seem to fail with iconv, which seems to strip them all. Adding an alternate test
+     // to make sure this is a stable phenomenon. cf. http://codesnipers.com/?q=splitting-surrogate-pairs
+     // and also http://www.unicode.org/faq/utf_bom.html
+     // Single UTF-16 surrogates
+     /*
+     $this->invalidParseErrorTestHandler("\xED\xA0\x80", 1, 'U+D800 (UTF-16 surrogate character)');
+     $this->invalidParseErrorTestHandler("\xED\xAD\xBF", 1, 'U+DB7F (UTF-16 surrogate character)');
+     $this->invalidParseErrorTestHandler("\xED\xAE\x80", 1, 'U+DB80 (UTF-16 surrogate character)');
+     $this->invalidParseErrorTestHandler("\xED\xAF\xBF", 1, 'U+DBFF (UTF-16 surrogate character)');
+     $this->invalidParseErrorTestHandler("\xED\xB0\x80", 1, 'U+DC00 (UTF-16 surrogate character)');
+     $this->invalidParseErrorTestHandler("\xED\xBE\x80", 1, 'U+DF80 (UTF-16 surrogate character)');
+     $this->invalidParseErrorTestHandler("\xED\xBF\xBF", 1, 'U+DFFF (UTF-16 surrogate character)');
     
-  //   // Permanent noncharacters
-  //   $this->invalidParseErrorTestHandler("\xEF\xB7\x90", 1, 'U+FDD0 (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xEF\xB7\xAF", 1, 'U+FDEF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xEF\xBF\xBE", 1, 'U+FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xEF\xBF\xBF", 1, 'U+FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF0\x9F\xBF\xBE", 1, 'U+1FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF0\x9F\xBF\xBF", 1, 'U+1FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF0\xAF\xBF\xBE", 1, 'U+2FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF0\xAF\xBF\xBF", 1, 'U+2FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF0\xBF\xBF\xBE", 1, 'U+3FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF0\xBF\xBF\xBF", 1, 'U+3FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\x8F\xBF\xBE", 1, 'U+4FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\x8F\xBF\xBF", 1, 'U+4FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\x9F\xBF\xBE", 1, 'U+5FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\x9F\xBF\xBF", 1, 'U+5FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\xAF\xBF\xBE", 1, 'U+6FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\xAF\xBF\xBF", 1, 'U+6FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\xBF\xBF\xBE", 1, 'U+7FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF1\xBF\xBF\xBF", 1, 'U+7FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\x8F\xBF\xBE", 1, 'U+8FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\x8F\xBF\xBF", 1, 'U+8FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\x9F\xBF\xBE", 1, 'U+9FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\x9F\xBF\xBF", 1, 'U+9FFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\xAF\xBF\xBE", 1, 'U+AFFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\xAF\xBF\xBF", 1, 'U+AFFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\xBF\xBF\xBE", 1, 'U+BFFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF2\xBF\xBF\xBF", 1, 'U+BFFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\x8F\xBF\xBE", 1, 'U+CFFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\x8F\xBF\xBF", 1, 'U+CFFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\x9F\xBF\xBE", 1, 'U+DFFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\x9F\xBF\xBF", 1, 'U+DFFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\xAF\xBF\xBE", 1, 'U+EFFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\xAF\xBF\xBF", 1, 'U+EFFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\xBF\xBF\xBE", 1, 'U+FFFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF3\xBF\xBF\xBF", 1, 'U+FFFFF (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF4\x8F\xBF\xBE", 1, 'U+10FFFE (permanent noncharacter)');
-  //   $this->invalidParseErrorTestHandler("\xF4\x8F\xBF\xBF", 1, 'U+10FFFF (permanent noncharacter)');
-  // }
+     // Paired UTF-16 surrogates
+     $this->invalidParseErrorTestHandler("\xED\xA0\x80\xED\xB0\x80", 2, 'U+D800 U+DC00 (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xA0\x80\xED\xBF\xBF", 2, 'U+D800 U+DFFF (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xAD\xBF\xED\xB0\x80", 2, 'U+DB7F U+DC00 (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xAD\xBF\xED\xBF\xBF", 2, 'U+DB7F U+DFFF (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xAE\x80\xED\xB0\x80", 2, 'U+DB80 U+DC00 (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xAE\x80\xED\xBF\xBF", 2, 'U+DB80 U+DFFF (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xAF\xBF\xED\xB0\x80", 2, 'U+DBFF U+DC00 (paired UTF-16 surrogates)');
+     $this->invalidParseErrorTestHandler("\xED\xAF\xBF\xED\xBF\xBF", 2, 'U+DBFF U+DFFF (paired UTF-16 surrogates)');
+      */
+
+     // MPB: This seems to be non-conformant to Unicode, but... there's nothing we can really do about that.
+     // So we just test to make sure this is consistent.
+     $stripped_surrogates = array(
+       "\xED\xA0\x80",
+       "\xED\xAD\xBF",
+       "\xED\xAE\x80",
+       "\xED\xAF\xBF",
+       "\xED\xB0\x80",
+       "\xED\xBE\x80",
+       "\xED\xBF\xBF",
+      
+       // Paired UTF-16 surrogates
+       "\xED\xA0\x80\xED\xB0\x80",
+       "\xED\xA0\x80\xED\xBF\xBF",
+       "\xED\xAD\xBF\xED\xB0\x80",
+       "\xED\xAD\xBF\xED\xBF\xBF",
+       "\xED\xAE\x80\xED\xB0\x80",
+       "\xED\xAE\x80\xED\xBF\xBF",
+       "\xED\xAF\xBF\xED\xB0\x80",
+       "\xED\xAF\xBF\xED\xBF\xBF",
+     );
+     foreach($stripped_surrogates as $sur) {
+       $is = new StringInputStream($sur);
+       $this->assertEquals('', $is->remainingChars(), sprintf("Surrogate removed: %d", $sur));
+
+     }
+   }
 }