diff --git a/src/wp-includes/html-api/class-wp-html-processor.php b/src/wp-includes/html-api/class-wp-html-processor.php
index 967d616129647..f88759d909c13 100644
--- a/src/wp-includes/html-api/class-wp-html-processor.php
+++ b/src/wp-includes/html-api/class-wp-html-processor.php
@@ -2920,8 +2920,7 @@ private function step_in_body(): bool {
case '-STRONG':
case '-TT':
case '-U':
- $this->run_adoption_agency_algorithm();
- return true;
+ return $this->run_adoption_agency_algorithm();
/*
* > A start tag whose tag name is one of: "applet", "marquee", "object"
@@ -3256,38 +3255,60 @@ private function step_in_body(): bool {
/*
* > Any other end tag
*/
+ return $this->step_in_body_any_other_end_tag();
+ }
- /*
- * Find the corresponding tag opener in the stack of open elements, if
- * it exists before reaching a special element, which provides a kind
- * of boundary in the stack. For example, a `` should not
- * close anything beyond its containing `P` or `DIV` element.
- */
- foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
- if ( 'html' === $node->namespace && $token_name === $node->node_name ) {
- break;
- }
+ $this->bail( 'Should not have been able to reach end of IN BODY processing. Check HTML API code.' );
+ // This unnecessary return prevents tools from inaccurately reporting type errors.
+ return false;
+ }
- if ( self::is_special( $node ) ) {
- // This is a parse error, ignore the token.
- return $this->step();
- }
+ /**
+ * Applies the "any other end tag" parsing instructions for the IN BODY insertion mode.
+ *
+ * @since 7.1.0
+ * @ignore
+ *
+ * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+ *
+ * @see https://html.spec.whatwg.org/#parsing-main-inbody
+ * @see WP_HTML_Processor::step_in_body
+ *
+ * @return bool Whether an element was found.
+ */
+ private function step_in_body_any_other_end_tag(): bool {
+ $token_name = $this->get_token_name();
+
+ /*
+ * Find the corresponding tag opener in the stack of open elements, if
+ * it exists before reaching a special element, which provides a kind
+ * of boundary in the stack. For example, a `` should not
+ * close anything beyond its containing `P` or `DIV` element.
+ */
+ foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+ if ( 'html' === $node->namespace && $token_name === $node->node_name ) {
+ break;
}
- $this->generate_implied_end_tags( $token_name );
- if ( $node !== $this->state->stack_of_open_elements->current_node() ) {
- // @todo Record parse error: this error doesn't impact parsing.
+ if ( self::is_special( $node ) ) {
+ // This is a parse error, ignore the token.
+ return $this->step();
}
+ }
- foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
- $this->state->stack_of_open_elements->pop();
- if ( $node === $item ) {
- return true;
- }
+ $this->generate_implied_end_tags( $token_name );
+ if ( $node !== $this->state->stack_of_open_elements->current_node() ) {
+ // @todo Record parse error: this error doesn't impact parsing.
+ }
+
+ foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+ $this->state->stack_of_open_elements->pop();
+ if ( $node === $item ) {
+ return true;
}
}
- $this->bail( 'Should not have been able to reach end of IN BODY processing. Check HTML API code.' );
+ $this->bail( 'Should not have been able to reach end of "any other end tag" IN BODY processing. Check HTML API code.' );
// This unnecessary return prevents tools from inaccurately reporting type errors.
return false;
}
@@ -6223,8 +6244,10 @@ private function reset_insertion_mode_appropriately(): void {
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
*
* @see https://html.spec.whatwg.org/#adoption-agency-algorithm
+ *
+ * @return bool Whether the current token was handled without exhausting input.
*/
- private function run_adoption_agency_algorithm(): void {
+ private function run_adoption_agency_algorithm(): bool {
$budget = 1000;
$subject = $this->get_tag();
$current_node = $this->state->stack_of_open_elements->current_node();
@@ -6236,13 +6259,13 @@ private function run_adoption_agency_algorithm(): void {
! $this->state->active_formatting_elements->contains_node( $current_node )
) {
$this->state->stack_of_open_elements->pop();
- return;
+ return true;
}
$outer_loop_counter = 0;
while ( $budget-- > 0 ) {
if ( $outer_loop_counter++ >= 8 ) {
- return;
+ return true;
}
/*
@@ -6263,20 +6286,20 @@ private function run_adoption_agency_algorithm(): void {
}
}
- // > If there is no such element, then return and instead act as described in the "any other end tag" entry above.
+ // > If there is no such element, then act as described in the "any other end tag" entry above and return.
if ( null === $formatting_element ) {
- $this->bail( 'Cannot run adoption agency when "any other end tag" is required.' );
+ return $this->step_in_body_any_other_end_tag();
}
// > If formatting element is not in the stack of open elements, then this is a parse error; remove the element from the list, and return.
if ( ! $this->state->stack_of_open_elements->contains_node( $formatting_element ) ) {
$this->state->active_formatting_elements->remove_node( $formatting_element );
- return;
+ return true;
}
// > If formatting element is in the stack of open elements, but the element is not in scope, then this is a parse error; return.
if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $formatting_element->node_name ) ) {
- return;
+ return true;
}
/*
@@ -6312,7 +6335,7 @@ private function run_adoption_agency_algorithm(): void {
if ( $formatting_element->bookmark_name === $item->bookmark_name ) {
$this->state->active_formatting_elements->remove_node( $formatting_element );
- return;
+ return true;
}
}
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php b/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
index 5afe37a010a41..43a54c12fb0c0 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
@@ -265,6 +265,47 @@ public function test_unexpected_closing_tags_are_removed() {
);
}
+ /**
+ * Ensures that unexpected closing formatting tags are ignored.
+ *
+ * @ticket 65383
+ *
+ * @dataProvider data_formatting_tag_names
+ *
+ * @param string $formatting_tag_name Formatting tag name with no active formatting element.
+ */
+ public function test_unexpected_closing_formatting_tags_are_ignored( string $formatting_tag_name ) {
+ $this->assertSame(
+ 'onetwo',
+ WP_HTML_Processor::normalize( "onetwo" ),
+ "Should have ignored unexpected {$formatting_tag_name} closer."
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array[string, array{0: string}]
+ */
+ public static function data_formatting_tag_names(): array {
+ return array(
+ 'A tag' => array( 'a' ),
+ 'B tag' => array( 'b' ),
+ 'BIG tag' => array( 'big' ),
+ 'CODE tag' => array( 'code' ),
+ 'EM tag' => array( 'em' ),
+ 'FONT tag' => array( 'font' ),
+ 'I tag' => array( 'i' ),
+ 'NOBR tag' => array( 'nobr' ),
+ 'S tag' => array( 's' ),
+ 'SMALL tag' => array( 'small' ),
+ 'STRIKE tag' => array( 'strike' ),
+ 'STRONG tag' => array( 'strong' ),
+ 'TT tag' => array( 'tt' ),
+ 'U tag' => array( 'u' ),
+ );
+ }
+
/**
* Ensures that self-closing elements in foreign content retain their self-closing flag.
*
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php
index b54fc047ab040..8408e698cb580 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php
@@ -577,6 +577,7 @@ public static function data_virtual_nodes_breadcrumbs() {
'Implied P tag opener on unmatched closer' => array( '', 1, 'P', 'open', array( 'HTML', 'BODY', 'P' ) ),
'Implied heading tag closer on heading child' => array( '