Fix non-PI-node tests

Author: dmsnell

src/wp-includes/html-api/class-wp-html-tag-processor.php

@@ -927,9 +927,11 @@ public function next_token() {
 		 * the closing to tag to point to the opening of the special atomic
 		 * tag sequence.
 		 */
-		$tag_name_starts_at = $this->tag_name_starts_at;
-		$tag_name_length    = $this->tag_name_length;
-		$tag_ends_at        = $this->token_starts_at + $this->token_length;
+		$tag_name_starts_at   = $this->tag_name_starts_at;
+		$tag_name_length      = $this->tag_name_length;
+		$tag_ends_at          = $this->token_starts_at + $this->token_length;
+		$attributes           = $this->attributes;
+		$duplicate_attributes = $this->duplicate_attributes;
 
 		// Find the closing tag.
 		$found_closer = false;
@@ -965,12 +967,14 @@ public function next_token() {
 		 * functions that skip the contents have moved all the internal cursors past
 		 * the inner content of the tag.
 		 */
-		$this->token_starts_at    = $was_at;
-		$this->token_length       = $this->bytes_already_parsed - $this->token_starts_at;
-		$this->text_starts_at     = $tag_ends_at + 1;
-		$this->text_length        = $this->tag_name_starts_at - $this->text_starts_at;
-		$this->tag_name_starts_at = $tag_name_starts_at;
-		$this->tag_name_length    = $tag_name_length;
+		$this->token_starts_at      = $was_at;
+		$this->token_length         = $this->bytes_already_parsed - $this->token_starts_at;
+		$this->text_starts_at       = $tag_ends_at + 1;
+		$this->text_length          = $this->tag_name_starts_at - $this->text_starts_at;
+		$this->tag_name_starts_at   = $tag_name_starts_at;
+		$this->tag_name_length      = $tag_name_length;
+		$this->attributes           = $attributes;
+		$this->duplicate_attributes = $duplicate_attributes;
 
 		return true;
 	}
@@ -1685,12 +1689,19 @@ private function parse_next_tag() {
 				 * to the bogus comment state - skip to the nearest >. If no closer is
 				 * found then the HTML was truncated inside the markup declaration.
 				 */
-				$at = strpos( $html, '>', $at + 1 );
-				if ( false === $at ) {
+				$closer_at = strpos( $html, '>', $at + 1 );
+				if ( false === $closer_at ) {
 					$this->parser_state = self::STATE_INCOMPLETE;
 
 					return false;
 				}
+
+				$this->parser_state         = self::STATE_COMMENT;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+				return true;
 			}
 
 			/*
@@ -1712,6 +1723,9 @@ private function parse_next_tag() {
 			/*
 			 * <? transitions to a bogus comment state – skip to the nearest >
 			 * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 *
+			 * Although this becomes a DOM comment, the Tag Processor is going to treat
+			 * it as a processing instruction to be able to treat it as the raw syntax.
 			 */
 			if ( '?' === $html[ $at + 1 ] ) {
 				$closer_at = strpos( $html, '>', $at + 2 );
@@ -1721,7 +1735,7 @@ private function parse_next_tag() {
 					return false;
 				}
 
-				$this->parser_state         = self::STATE_DOCTYPE;
+				$this->parser_state         = self::STATE_PI_NODE;
 				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
 				$this->text_starts_at       = $this->token_starts_at + 2;
 				$this->text_length          = $closer_at - $this->text_starts_at;