Skip to content
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

[6.7 Branch] HTML API: Expect closer on foreign content void lookalike elements. #8173

Closed
wants to merge 1 commit into from
Closed

[6.7 Branch] HTML API: Expect closer on foreign content void lookalike elements. #8173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ public function expects_closer( ?WP_HTML_Token $node = null ): ?bool {
// Doctype declarations.
'html' === $token_name ||
// Void elements.
self::is_void( $token_name ) ||
( 'html' === $token_namespace && self::is_void( $token_name ) ) ||
// Special atomic elements.
( 'html' === $token_namespace && in_array( $token_name, array( 'IFRAME', 'NOEMBED', 'NOFRAMES', 'SCRIPT', 'STYLE', 'TEXTAREA', 'TITLE', 'XMP' ), true ) ) ||
// Self-closing elements in foreign content.
Expand Down
25 changes: 25 additions & 0 deletions tests/phpunit/tests/html-api/wpHtmlProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,31 @@ public function test_expects_closer_foreign_content_self_closing() {
$this->assertTrue( $processor->expects_closer() );
}

/**
* Ensures that expects_closer works for void-like elements in foreign content.
*
* For example, `<svg><input>text` creates an `svg:input` that contains a text node.
* This input should not be treated as a void tag and _should_ expect a close tag.
*
* @dataProvider data_void_tags
*
* @ticket 62363
*/
public function test_expects_closer_foreign_content_not_void( string $void_tag ) {
$processor = WP_HTML_Processor::create_fragment( "<svg><{$void_tag}>" );

$this->assertTrue( $processor->next_tag( $void_tag ) );

// Some void-like tags will close the SVG element and be HTML tags.
if ( $processor->get_namespace() === 'svg' ) {
$this->assertSame( array( 'HTML', 'BODY', 'SVG', $void_tag ), $processor->get_breadcrumbs() );
$this->assertTrue( $processor->expects_closer() );
} else {
$this->assertSame( array( 'HTML', 'BODY', $void_tag ), $processor->get_breadcrumbs() );
$this->assertFalse( $processor->expects_closer() );
}
}

/**
* Ensures that self-closing foreign SCRIPT elements are properly found.
*
Expand Down
Loading