diff options
| author | Technosophos <[email protected]> | 2013-04-15 17:47:58 -0500 |
|---|---|---|
| committer | Technosophos <[email protected]> | 2013-04-15 17:47:58 -0500 |
| commit | 391e4f31e3f0e7935a46431783896153156a65eb (patch) | |
| tree | 8bef74cc8df6ffb6561a31b2a8fbfb2953346726 /src | |
| parent | 34718c58884fe5e7d645e4bf12d9c39d77cc8b4d (diff) | |
Unit tests for DOCTYPE are all passing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/HTML5/Parser/Tokenizer.php | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/HTML5/Parser/Tokenizer.php b/src/HTML5/Parser/Tokenizer.php index 466cb5d..4f1404f 100644 --- a/src/HTML5/Parser/Tokenizer.php +++ b/src/HTML5/Parser/Tokenizer.php @@ -465,10 +465,18 @@ class Tokenizer { // Short DOCTYPE, like <!DOCTYPE html> if ($tok == '>') { + // DOCTYPE without a name. + if (strlen($doctypeName) == 0) { + $this->parseError("Expected a DOCTYPE name. Got nothing."); + $this->events->doctype($doctypeName, 0, NULL, TRUE); + $this->scanner->next(); + return TRUE; + } $this->events->doctype($doctypeName); $this->scanner->next(); return TRUE; } + $this->scanner->whitespace(); $pub = strtoupper($this->scanner->getAsciiAlpha()); $white = strlen($this->scanner->whitespace()); @@ -484,10 +492,18 @@ class Tokenizer { return FALSE; } + // Premature EOF. + if ($this->scanner->current() === FALSE) { + $this->parseError("Unexpected EOF in DOCTYPE"); + $this->events->doctype($doctypeName, $type, $id, TRUE); + return TRUE; + } + // Well-formed complete DOCTYPE. $this->scanner->whitespace(); if ($this->scanner->current() == '>') { $this->events->doctype($doctypeName, $type, $id, FALSE); + $this->scanner->next(); return TRUE; } @@ -496,6 +512,7 @@ class Tokenizer { $this->scanner->charsUntil(">"); $this->parseError("Malformed DOCTYPE."); $this->events->doctype($doctypeName, $type, $id, TRUE); + $this->scanner->next(); return TRUE; } @@ -503,8 +520,9 @@ class Tokenizer { // Consume to > and trash. $this->scanner->charsUntil('>'); - $this->parseError("Expected PUBLIC or SYSTEM. Got %s%s.", $pub); + $this->parseError("Expected PUBLIC or SYSTEM. Got %s.", $pub); $this->events->doctype($doctypeName, 0, NULL, TRUE); + $this->scanner->next(); return TRUE; } |