Browse Source

Minor cleanup

split-manual
J. King 3 years ago
parent
commit
93f0e3cf73
  1. 21
      lib/TreeBuilder.php
  2. 12
      vendor-bin/phpunit/composer.lock

21
lib/TreeBuilder.php

@ -294,6 +294,7 @@ class TreeBuilder {
$this->debugLog .= "EMITTED: ".constant(get_class($token)."::NAME")."\n";
return true;
})());
assert($token instanceof CharacterToken || $token instanceof CommentToken || $token instanceof TagToken || $token instanceof DOCTYPEToken || $token instanceof EOFToken, new \Exception("Unknown token class ".get_class($token)));
$iterations = 0;
$insertionMode = $this->insertionMode;
@ -491,6 +492,7 @@ class TreeBuilder {
# set the Document to quirks mode.
// DEVIATION: There is no iframe srcdoc document because there are no nested
// browsing contexts in this implementation.
assert($token instanceof CharacterToken || $token instanceof TagToken || $token instanceof EOFToken, new \Exception("Unexpected token class ".get_class($token)));
if ($token instanceof StartTagToken) {
$this->error(ParseError::EXPECTED_DOCTYPE_BUT_GOT_START_TAG, $token->name);
} elseif ($token instanceof EndTagToken) {
@ -499,8 +501,6 @@ class TreeBuilder {
$this->error(ParseError::EXPECTED_DOCTYPE_BUT_GOT_CHARS);
} elseif ($token instanceof EOFToken) {
$this->error(ParseError::EXPECTED_DOCTYPE_BUT_GOT_EOF);
} else {
throw new \Exception("Unexpected token type".get_class($token));
}
$this->DOM->quirksMode = Document::QUIRKS_MODE;
@ -3108,14 +3108,13 @@ class TreeBuilder {
# Anything else
else {
# Parse error.
assert($token instanceof CharacterToken || $token instanceof TagToken, new \Exception("Unexpected token class ".get_class($token)));
if ($token instanceof StartTagToken) {
$this->error(ParseError::UNEXPECTED_START_TAG, $token->name);
} elseif ($token instanceof EndTagToken) {
$this->error(ParseError::UNEXPECTED_END_TAG, $token->name);
} elseif ($token instanceof CharacterToken) {
$this->error(ParseError::UNEXPECTED_CHAR);
} else {
throw new \Exception("Unexpected token type".get_class($token));
}
# Switch the insertion mode to "in body"
# and reprocess the token.
@ -3211,6 +3210,7 @@ class TreeBuilder {
# Anything else
else {
# Parse error. Ignore the token.
assert($token instanceof CharacterToken || $token instanceof TagToken, new \Exception("Unexpected token class ".get_class($token)));
if ($token instanceof StartTagToken) {
$this->error(ParseError::UNEXPECTED_START_TAG, $token->name);
} elseif ($token instanceof EndTagToken) {
@ -3222,8 +3222,6 @@ class TreeBuilder {
if (strlen($ws)) {
$this->insertCharacterToken(new WhitespaceToken($ws));
}
} else {
throw new \Exception("Unexpected token type".get_class($token));
}
}
}
@ -3273,6 +3271,7 @@ class TreeBuilder {
# Anything else
else {
# Parse error. Ignore the token.
assert($token instanceof CharacterToken || $token instanceof TagToken, new \Exception("Unexpected token class ".get_class($token)));
if ($token instanceof StartTagToken) {
$this->error(ParseError::UNEXPECTED_START_TAG, $token->name);
} elseif ($token instanceof EndTagToken) {
@ -3284,8 +3283,6 @@ class TreeBuilder {
if (strlen($ws)) {
$this->insertCharacterToken(new WhitespaceToken($ws));
}
} else {
throw new \Exception("Unexpected token type".get_class($token));
}
}
}
@ -3315,14 +3312,13 @@ class TreeBuilder {
# Anything else
else {
# Parse error.
assert($token instanceof CharacterToken || $token instanceof TagToken, new \Exception("Unexpected token class ".get_class($token)));
if ($token instanceof StartTagToken) {
$this->error(ParseError::UNEXPECTED_START_TAG, $token->name);
} elseif ($token instanceof EndTagToken) {
$this->error(ParseError::UNEXPECTED_END_TAG, $token->name);
} elseif ($token instanceof CharacterToken) {
$this->error(ParseError::UNEXPECTED_CHAR);
} else {
throw new \Exception("Unexpected token type".get_class($token));
}
# Switch the insertion mode to "in body" and reprocess the token.
$insertionMode = $this->insertionMode = self::IN_BODY_MODE;
@ -3362,19 +3358,18 @@ class TreeBuilder {
# Anything else
else {
# Parse error. Ignore the token.
assert($token instanceof CharacterToken || $token instanceof TagToken, new \Exception("Unexpected token class ".get_class($token)));
if ($token instanceof StartTagToken) {
$this->error(ParseError::UNEXPECTED_START_TAG, $token->name);
} elseif ($token instanceof EndTagToken) {
$this->error(ParseError::UNEXPECTED_END_TAG, $token->name);
} elseif ($token instanceof CharacterToken) {
$this->error(ParseError::UNEXPECTED_CHAR);
} else {
throw new \Exception("Unexpected token type".get_class($token));
}
}
}
else {
throw new \Exception("UNREACHABLE CODE");
throw new \Exception("UNREACHABLE CODE"); // @codeCoverageIgnore
}
}
# Otherwise

12
vendor-bin/phpunit/composer.lock

@ -460,16 +460,16 @@
},
{
"name": "phpspec/prophecy",
"version": "1.12.2",
"version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "245710e971a030f42e08f4912863805570f23d39"
"reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
"reference": "245710e971a030f42e08f4912863805570f23d39",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
"reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
"shasum": ""
},
"require": {
@ -521,9 +521,9 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy/issues",
"source": "https://github.com/phpspec/prophecy/tree/1.12.2"
"source": "https://github.com/phpspec/prophecy/tree/1.13.0"
},
"time": "2020-12-19T10:15:11+00:00"
"time": "2021-03-17T13:42:18+00:00"
},
{
"name": "phpunit/php-code-coverage",

Loading…
Cancel
Save