Adjust get_updated_xml_applies_the_updates_so_far_and_keeps_the_processor_on_the_current_tag test to use a root node

Author: adamziel

components/XML/Tests/XMLProcessorTest.php

@@ -480,23 +480,25 @@ public function test_to_string_returns_updated_xml() {
 	 * @covers XMLProcessor::get_updated_xml
 	 */
 	public function test_get_updated_xml_applies_the_updates_so_far_and_keeps_the_processor_on_the_current_tag() {
-		$processor = XMLProcessor::create_from_string( '<line id="remove" /><content enabled="yes" post-type="test">Test</content><text id="span-id"></text>' );
+		$processor = XMLProcessor::create_from_string( '<doc><line id="remove" /><content enabled="yes" post-type="test">Test</content><text id="span-id"></text></doc>' );
+		$processor->next_tag();
+
 		$processor->next_tag();
 		$processor->remove_attribute( '', 'id' );
 
 		$processor->next_tag();
 		$processor->set_attribute( '', 'id', 'content-id-1' );
 
 		$this->assertSame(
-			'<line  /><content id="content-id-1" enabled="yes" post-type="test">Test</content><text id="span-id"></text>',
+			'<doc><line  /><content id="content-id-1" enabled="yes" post-type="test">Test</content><text id="span-id"></text></doc>',
 			$processor->get_updated_xml(),
 			'Calling get_updated_xml after updating the attributes of the second tag returned different XML than expected'
 		);
 
 		$processor->set_attribute( '', 'id', 'content-id-2' );
 
 		$this->assertSame(
-			'<line  /><content id="content-id-2" enabled="yes" post-type="test">Test</content><text id="span-id"></text>',
+			'<doc><line  /><content id="content-id-2" enabled="yes" post-type="test">Test</content><text id="span-id"></text></doc>',
 			$processor->get_updated_xml(),
 			'Calling get_updated_xml after updating the attributes of the second tag for the second time returned different XML than expected'
 		);
@@ -505,7 +507,7 @@ public function test_get_updated_xml_applies_the_updates_so_far_and_keeps_the_pr
 		$processor->remove_attribute( '', 'id' );
 
 		$this->assertSame(
-			'<line  /><content id="content-id-2" enabled="yes" post-type="test">Test</content><text ></text>',
+			'<doc><line  /><content id="content-id-2" enabled="yes" post-type="test">Test</content><text ></text></doc>',
 			$processor->get_updated_xml(),
 			'Calling get_updated_xml after removing the id attribute of the third tag returned different XML than expected'
 		);
@@ -1717,6 +1719,27 @@ public function test_detects_invalid_document_no_root_tag() {
 		$this->assertFalse( $processor->next_tag(), 'Found an element when there was none.' );
 		$this->assertTrue( $processor->is_paused_at_incomplete_input(), 'Did not indicate that the XML input was incomplete.' );
 	}
+	
+	/**
+	 *
+	 * @covers XMLProcessor::next_tag
+	 */
+	public function test_tolerates_illegal_extender_in_pi_target() {
+		$processor = XMLProcessor::create_from_string(
+			'<!DOCTYPE animal [
+<!ELEMENT animal ANY>
+<?_˒ an illegal extender #x2d2 in PITarget ?>
+]>
+<animal/>
+'
+		);
+		$this->assertTrue( $processor->next_tag(), 'Found an element when there was none.' );
+		$this->assertEquals( 'animal', $processor->get_tag_local_name(), 'Did not find the expected tag.' );
+		$this->assertTrue( $processor->next_token(), 'Found an element when there was none.' );
+		$this->assertFalse( $processor->next_token(), 'Found an element when there was none.' );
+		$this->assertNull( $processor->get_last_error(), 'Did not find the expected error.' );
+		$this->assertNull( $processor->get_exception(), 'Did not find the expected error.' );
+	}
 
 	/**
 	 *

components/XML/class-xmlprocessor.php

@@ -4086,15 +4086,16 @@ private function step( $node_to_process = self::PROCESS_NEXT_NODE ) {
 			return false;
 		}
 
-	if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
-		if ( $this->is_empty_element() ) {
-			array_pop( $this->stack_of_open_elements );
-			$this->element = $this->top_element();
-			if ( 0 === count( $this->stack_of_open_elements ) ) {
-				$this->parser_context = self::IN_MISC_CONTEXT;
+		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
+			if ( $this->is_empty_element() ) {
+				array_pop( $this->stack_of_open_elements );
+				if ( empty( $this->stack_of_open_elements ) ) {
+					// We've just popped the root element – the context
+					// becomes "misc" by definition.
+					$this->parser_context = self::IN_MISC_CONTEXT;
+				}
 			}
 		}
-	}
 
 		try {
 			switch ( $this->parser_context ) {