Skip to content

HTML API: Ensure form feed is recognized as close tag name terminator #12936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sirreal wants to merge 6 commits into
base: trunk
Choose a base branch
from
+49 −1
Open

HTML API: Ensure form feed is recognized as close tag name terminator #12936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65c6ad5
HTML API: Test form feed in special end tags.
sirreal Aug 7, 2026
8536658
HTML API: Recognize form feed after special end tag names.
sirreal Aug 7, 2026
95fc0e0
HTML API: Declare form feed test return types.
sirreal Aug 7, 2026
c80fb05
HTML API: Cover every special end tag terminator.
sirreal Aug 7, 2026
c5914e9
Merge branch 'trunk' into html-api-rawtext-ff
sirreal Aug 10, 2026
94536a8
HTML API: Add ticket annotation to form feed terminator test
sirreal Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/html-api/class-wp-html-tag-processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ private function skip_rcdata( string $tag_name ): bool {
* though "textarea" is found within the text.
*/
$c = $html[ $at ];
if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
if ( ' ' !== $c && "\t" !== $c && "\f" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
continue;
}

Expand Down
48 changes: 48 additions & 0 deletions tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2369,6 +2369,54 @@ public static function data_script_tag(): Generator {
yield 'Script tag double-escaped with <script\r' => array( "<script><!--<script\r</script>", false );
}

/**
* Ensures that tag-name-terminating characters close RCDATA and RAWTEXT elements.
*
* @ticket 65372
*
* @dataProvider data_rcdata_and_rawtext_tag_name_terminators
*
* @param string $tag_name The RCDATA or RAWTEXT tag name.
* @param string $tag_name_terminator The tag-name-terminating character.
Comment on lines +2379 to +2380

@westonruter westonruter Aug 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @param string $tag_name The RCDATA or RAWTEXT tag name.
* @param string $tag_name_terminator The tag-name-terminating character.
* @param non-falsy-string $tag_name The RCDATA or RAWTEXT tag name.
* @param non-falsy-string $tag_name_terminator The tag-name-terminating character.

*/
public function test_rcdata_and_rawtext_end_tags_accept_tag_name_terminators( string $tag_name, string $tag_name_terminator ): void {
$end_tag_closer = '>' === $tag_name_terminator ? '' : '>';
$processor = new WP_HTML_Tag_Processor( "<{$tag_name}>content</{$tag_name}{$tag_name_terminator}{$end_tag_closer}<div>" );

$this->assertTrue( $processor->next_token(), "Expected to find complete {$tag_name} tag." );
$this->assertSame( strtoupper( $tag_name ), $processor->get_tag() );
$this->assertSame( 'content', $processor->get_modifiable_text() );
$this->assertTrue( $processor->next_tag( 'DIV' ), "Expected to find DIV after the {$tag_name} element." );
}

/**
* Provides every RCDATA and RAWTEXT tag with every tag-name-terminating character.
*
* @return Generator<string, array{string, string}> Test cases.

@westonruter westonruter Aug 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @return Generator<string, array{string, string}> Test cases.
* @return Generator<non-falsy-string, array{non-falsy-string, non-falsy-string}> Test cases.

*/
public static function data_rcdata_and_rawtext_tag_name_terminators(): Generator {
foreach ( array( 'IFRAME', 'NOEMBED', 'NOFRAMES', 'STYLE', 'XMP', 'TEXTAREA', 'TITLE' ) as $tag_name ) {
foreach ( self::data_tag_name_terminators() as $terminator_name => $terminator_data ) {
yield "{$tag_name} + {$terminator_name}" => array( strtolower( $tag_name ), $terminator_data[0] );
}
}
}

/**
* Provides tag-name-terminating characters.
*
* @return Generator<string, array{string}> Test cases.

@westonruter westonruter Aug 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @return Generator<string, array{string}> Test cases.
* @return Generator<non-falsy-string, array{non-falsy-string}> Test cases.

*/
public static function data_tag_name_terminators(): Generator {

@westonruter westonruter Aug 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, nice. I didn't realize you could use a generator as a data provider.

yield 'SPACE' => array( ' ' );
yield 'TAB' => array( "\t" );
yield 'LINE FEED' => array( "\n" );
yield 'FORM FEED' => array( "\f" );
yield 'CARRIAGE RETURN' => array( "\r" );
yield 'SOLIDUS' => array( '/' );
yield 'GREATER-THAN SIGN' => array( '>' );
}

/**
* Invalid tag names are comments on tag closers.
*
Expand Down
Loading