Continue updating patch.

Author: dmsnell

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

@@ -1373,13 +1373,15 @@ private function step_in_body() {
 			 * > A start tag whose tag name is "iframe"
 			 */
 			case '+IFRAME':
+				$this->insert_html_element( $this->state->current_token );
 				$this->state->frameset_ok = false;
 				return true;
 
 			/*
 			 * > A start tag whose tag name is "noembed"
 			 */
 			case '+NOEMBED':
+				$this->insert_html_element( $this->state->current_token );
 				return true;
 		}
 

tests/phpunit/tests/html-api/wpHtmlProcessor.php

@@ -112,18 +112,23 @@ public function test_clear_to_navigate_after_seeking() {
 	}
 
 	/**
-	 * Ensures that support is added for reconstructing active formatting elements
-	 * before the HTML Processor handles situations with unclosed formats requiring it.
+	 * Ensures that support is added for reconstructing active formatting elements.
 	 *
 	 * @ticket 58517
 	 *
 	 * @covers WP_HTML_Processor::reconstruct_active_formatting_elements
 	 */
-	public function test_fails_to_reconstruct_formatting_elements() {
-		$processor = WP_HTML_Processor::create_fragment( '<p><em>One<p><em>Two<p><em>Three<p><em>Four' );
+	public function test_reconstructs_formatting_elements() {
+		$processor = WP_HTML_Processor::create_fragment( '<p><em>One<p><em><span>Two<p><em>Three<p><em>Four' );
 
 		$this->assertTrue( $processor->next_tag( 'EM' ), 'Could not find first EM.' );
-		$this->assertFalse( $processor->next_tag( 'EM' ), 'Should have aborted before finding second EM as it required reconstructing the first EM.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'P', 'EM' ), $processor->get_breadcrumbs(), 'Found incorrect breadcrumbs for first EM.' );
+		$this->assertTrue( $processor->next_tag( 'SPAN' ), 'Could not find test span.' );
+		$this->assertSame(
+			array( 'HTML', 'BODY', 'P', 'EM', 'EM', 'SPAN' ),
+			$processor->get_breadcrumbs(),
+			'Found incorrect breadcrumbs for test SPAN; should have created two EMs.'
+		);
 	}
 
 	/**

tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php

@@ -224,45 +224,55 @@ public static function data_unsupported_elements() {
 	}
 
 	/**
-	 * @ticket 58517
-	 *
-	 * @dataProvider data_unsupported_markup
+	 * Ensures that formats inside unclosed A elements are reconstructed.
 	 *
-	 * @param string $html HTML containing unsupported markup.
+	 * @ticket {TICKET_NUMBER}
 	 */
-	public function test_fails_when_encountering_unsupported_markup( $html, $description ) {
-		$processor = WP_HTML_Processor::create_fragment( $html );
-
-		while ( $processor->next_token() && null === $processor->get_attribute( 'supported' ) ) {
-			continue;
-		}
+	public function test_reconstructs_formatting_from_unclosed_a_elements() {
+		$processor = WP_HTML_Processor::create_fragment( '<a><strong>Click <a><big>Here</big></a></strong></a>' );
 
-		$this->assertNull(
-			$processor->get_last_error(),
-			'Bailed on unsupported input before finding supported checkpoint: check test code.'
+		$processor->next_tag( 'STRONG' );
+		$this->assertSame(
+			array( 'HTML', 'BODY', 'A', 'STRONG' ),
+			$processor->get_breadcrumbs(),
+			'Failed to construct starting breadcrumbs properly.'
 		);
 
-		$this->assertTrue( $processor->get_attribute( 'supported' ), 'Did not find required supported element.' );
-		$processor->next_token();
-		$this->assertNotNull( $processor->get_last_error(), "Didn't properly reject unsupported markup: {$description}" );
+		$processor->next_tag( 'BIG' );
+		$this->assertSame(
+			array( 'HTML', 'BODY', 'STRONG', 'A', 'BIG' ),
+			$processor->get_breadcrumbs(),
+			'Failed to reconstruct the active formatting elements after an unclosed A element.'
+		);
 	}
 
 	/**
-	 * Data provider.
+	 * Ensures that unclosed A elements are reconstructed.
 	 *
-	 * @return array[]
+	 * @ticket {TICKET_NUMBER}
 	 */
-	public static function data_unsupported_markup() {
-		return array(
-			'A with formatting following unclosed A' => array(
-				'<a><strong>Click <span supported><a unsupported><big>Here</big></a></strong></a>',
-				'Unclosed formatting requires complicated reconstruction.',
-			),
+	public function test_reconstructs_unclosed_a_elements() {
+		$processor = WP_HTML_Processor::create_fragment( '<a><div><a></div></a>' );
 
-			'A after unclosed A inside DIV'          => array(
-				'<a><div supported><a unsupported></div></a>',
-				'A is a formatting element, which requires more complicated reconstruction.',
-			),
+		$processor->next_tag( 'DIV' );
+		$this->assertSame(
+			array( 'HTML', 'BODY', 'DIV' ),
+			$processor->get_breadcrumbs(),
+			'Failed to construct breadcrumbs properly - the DIV should have closed the A element.'
+		);
+
+		// When the DIV re-opens, it reconstructs an unclosed A, then the A in the text is a second A.
+		$processor->next_tag( 'A' );
+		$this->assertSame(
+			array( 'HTML', 'BODY', 'DIV', 'A' ),
+			'Failed to create proper breadcrumbs for recreated A element.'
+		);
+
+		// This is the one that's second in the raw text.
+		$processor->next_tag( 'A' );
+		$this->assertSame(
+			array( 'HTML', 'BODY', 'DIV', 'A' ),
+			'Failed to create proper breadcrumbs for explicit A element - this A should have closed the reconstructed A.'
 		);
 	}