Changeset 59694

Timestamp:

01/23/2025 06:35:15 PM (8 weeks ago)

Author:

jorbin

Message:

HTML API: Expect closer on foreign content void lookalike elements.

Ensure that expects_closer returns false on tags that look like void HTML tags, but are actually not void tags in foreign content.

Reviewed by westonruter, jorbin.
Merges [59392] to the 6.7 branch.

Props jonsurrell, bernhard-reiter.
Fixes #62363.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• src/wp-includes/html-api/class-wp-html-processor.php (modified) (1 diff)
• tests/phpunit/tests/html-api/wpHtmlProcessor.php (modified) (1 diff)

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

@@ -805 +805 @@
             '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 ) ) ||

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

@@ -563 +563 @@
 
     /**
+     * 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.
      *