Merge pull request #66 from Masterminds/dash

Added support for dashes in element tag names (closes #65)

3 files changed, 7 insertions, 2 deletions

diff --git a/src/HTML5/Parser/Tokenizer.php b/src/HTML5/Parser/Tokenizer.php
index 92510de..f7b450f 100644
--- a/src/HTML5/Parser/Tokenizer.php
+++ b/src/HTML5/Parser/Tokenizer.php
@@ -353,7 +353,7 @@ class Tokenizer
         }
 
         // We know this is at least one char.
-        $name = strtolower($this->scanner->charsWhile(":0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+        $name = strtolower($this->scanner->charsWhile(":_-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
         $attributes = array();
         $selfClose = false;
 
diff --git a/test/HTML5/Html5Test.php b/test/HTML5/Html5Test.php
index 2b46b23..0ab367c 100644
--- a/test/HTML5/Html5Test.php
+++ b/test/HTML5/Html5Test.php
@@ -259,6 +259,12 @@ class Html5Test extends TestCase
         $res = $this->cycleFragment('<span></span>');
         $this->assertRegExp('|<span></span>|', $res);
 
+        // Elements with dashes and underscores
+        $res = $this->cycleFragment('<sp-an></sp-an>');
+        $this->assertRegExp('|<sp-an></sp-an>|', $res);
+        $res = $this->cycleFragment('<sp_an></sp_an>');
+        $this->assertRegExp('|<sp_an></sp_an>|', $res);
+
         // Should have no closing tag.
         $res = $this->cycle('<hr>');
         $this->assertRegExp('|<hr></body>|', $res);
diff --git a/test/HTML5/Parser/TokenizerTest.php b/test/HTML5/Parser/TokenizerTest.php
index bf04c58..8ff4d5c 100644
--- a/test/HTML5/Parser/TokenizerTest.php
+++ b/test/HTML5/Parser/TokenizerTest.php
@@ -557,7 +557,6 @@ class TokenizerTest extends \Masterminds\HTML5\Tests\TestCase
             '<static*all>' => 'static',
             '<h*0720/>' => 'h',
             '<st*ATTRIBUTE />' => 'st',
-            '<a-href="http://url.com/">' => 'a'
         );
 
         foreach ($cases as $html => $expected) {