In XML mode, tags are case sensitive

goetas · goetas · commit 5851989629b8 · 2016-08-17T20:18:58.000+02:00
Fixes #114
diff --git a/src/HTML5.php b/src/HTML5.php
@@ -166,9 +166,10 @@ public function hasErrors()
     public function parse(\Masterminds\HTML5\Parser\InputStream $input, array $options = array())
     {
         $this->errors = array();
-        $events = new DOMTreeBuilder(false, array_merge($this->getOptions(), $options));
+        $options = array_merge($this->getOptions(), $options);
+        $events = new DOMTreeBuilder(false, $options);
         $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events);
+        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML: Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
         $this->errors = $events->getErrors();
@@ -184,9 +185,10 @@ public function parse(\Masterminds\HTML5\Parser\InputStream $input, array $optio
      */
     public function parseFragment(\Masterminds\HTML5\Parser\InputStream $input, array $options = array())
     {
-        $events = new DOMTreeBuilder(true, array_merge($this->getOptions(), $options));
+        $options = array_merge($this->getOptions(), $options);
+        $events = new DOMTreeBuilder(true, $options);
         $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events);
+        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML: Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
         $this->errors = $events->getErrors();
diff --git a/src/HTML5/Parser/Tokenizer.php b/src/HTML5/Parser/Tokenizer.php
@@ -43,6 +43,10 @@ class Tokenizer
     protected $textMode = 0; // TEXTMODE_NORMAL;
     protected $untilTag = null;
 
+    const CONFORMANT_XML = 'xml';
+    const CONFORMANT_HTML = 'html';
+    protected $mode = self::CONFORMANT_HTML;
+
     const WHITE = "\t\n\f ";
 
     /**
@@ -57,11 +61,13 @@ class Tokenizer
      * @param \Masterminds\HTML5\Parser\EventHandler $eventHandler
      *            An event handler, initialized and ready to receive
      *            events.
+     * @param string $mode
      */
-    public function __construct($scanner, $eventHandler)
+    public function __construct($scanner, $eventHandler, $mode = self::CONFORMANT_HTML)
     {
         $this->scanner = $scanner;
         $this->events = $eventHandler;
+        $this->mode = $mode;
     }
 
     /**
@@ -335,7 +341,8 @@ protected function endTag()
             return $this->bogusComment('</');
         }
 
-        $name = strtolower($this->scanner->charsUntil("\n\f \t>"));
+        $name = $this->scanner->charsUntil("\n\f \t>");
+        $name = $this->mode === self::CONFORMANT_XML ? $name: strtolower($name);
         // Trash whitespace.
         $this->scanner->whitespace();
 
@@ -362,7 +369,8 @@ protected function tagName()
         }
 
         // We know this is at least one char.
-        $name = strtolower($this->scanner->charsWhile(":_-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+        $name = $this->scanner->charsWhile(":_-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+        $name = $this->mode === self::CONFORMANT_XML ? $name : strtolower($name);
         $attributes = array();
         $selfClose = false;
 
diff --git a/test/HTML5/Html5Test.php b/test/HTML5/Html5Test.php
@@ -399,6 +399,18 @@ public function testEntities()
         $this->assertRegExp('|R&amp;D|', $res);
     }
 
+    public function testCaseSensitiveTags()
+    {
+        $dom = $this->html5->loadHTML(
+            '<html><body><Button color="red">Error</Button></body></html>',
+            array(
+                "xmlNamespaces" => true
+            )
+        );
+        $out = $this->html5->saveHTML($dom);
+        $this->assertRegExp('|<html><body><Button color="red">Error</Button></body></html>|', $out);
+    }
+
     public function testComment()
     {
         $res = $this->cycle('a<!-- This is a test. -->b');
