Add method on InputStream to get all chars to EOF (this will allow us to re-optimize PLAINTEXT). Also we want to check that iconv extension is loaded, not that there is a function of that name.

gsnedders · gsnedders · commit 232fc0910880 · 2009-05-30T18:21:55.000+01:00
diff --git a/library/HTML5/InputStream.php b/library/HTML5/InputStream.php
@@ -71,7 +71,7 @@ public function __construct($data) {
         // We previously had an mbstring implementation here, but that
         // implementation is heavily non-conforming, so it's been
         // omitted.
-        if (function_exists('iconv')) {
+        if (extension_loaded('iconv')) {
             // non-conforming
             $data = iconv('UTF-8', 'UTF-8//IGNORE', $data);
         } else {
@@ -220,18 +220,14 @@ public function char() {
     }
 
     /**
-     * Return some range of characters.
+     * Get all characters until EOF.
      * @note This performs bounds checking
-     * @param $l Length
      */
-    public function chars($l = 1) {
-        if((int) $l > 0 && $this->char < $this->EOF) {
-            $this->char += $l;
-            if($l === 1) {
-                return $this->data[$this->char];
-            } else {
-                return substr($this->data, $this->char, $l);
-            }
+    public function remainingChars() {
+        if($this->char < $this->EOF) {
+            $data = substr($this->data, $this->char);
+            $this->char = $this->EOF;
+            return $data;
         } else {
             return false;
         }
