Changeset 58870 for trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php

Timestamp:

08/08/2024 04:13:25 PM (21 months ago)

Author:

dmsnell

Message:

HTML API: expect_closer() should report false for self-closing foreign elements.

Previously, WP_HTML_Processor::expects_closer() would report true for self-closing foreign elements when called without supplying a node in question, but it should have been reporting true just as it does for HTML elements.

This patch adds a test case demonstrating the issue and a bugfix.

The html5lib test runner was relying on the incorrect behavior, accidentally working. This is also corrected and the html5lib test now relies on the correct behavior of expects_closer().

Developed in ​https://github.com/wordpress/wordpress-develop/pull/7162
Discussed in https://core.trac.wordpress.org/ticket/61576

Follow-up to [58868].

Props: dmsnell.
See #61576.

File:

• trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php (modified) (3 diffs)

trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php

@@ -208 +208 @@
                     $tag_indent = $indent_level;
 
-                    if ( 'html' !== $namespace ) {
-                        if ( ! $processor->has_self_closing_flag() ) {
-                            ++$indent_level;
-                        }
-                    } elseif ( ! WP_HTML_Processor::is_void( $tag_name ) ) {
+                    if ( $processor->expects_closer() ) {
                         ++$indent_level;
                     }
@@ -276 +272 @@
                     $modifiable_text = $processor->get_modifiable_text();
                     if ( '' !== $modifiable_text ) {
-                        $output .= str_repeat( $indent, $indent_level ) . "\"{$modifiable_text}\"\n";
+                        $output .= str_repeat( $indent, $tag_indent + 1 ) . "\"{$modifiable_text}\"\n";
                     }
 
@@ -282 +278 @@
                         $output .= str_repeat( $indent, $indent_level ) . "content\n";
                         ++$indent_level;
-                    }
-
-                    if ( ! $processor->is_void( $tag_name ) && ! $processor->expects_closer() ) {
-                        --$indent_level;
                     }