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

Timestamp:

07/22/2024 10:22:03 PM (2 years ago)

Author:

dmsnell

Message:

HTML API: Add missing tags in IN BODY insertion mode to HTML Processor.

As part of work to add more spec support to the HTML API, this patch adds
support for the remaining missing tags in the IN BODY insertion mode. Not
all of the added tags are supported, because in some cases they reset the
insertion mode and are reprocessed where they will be rejected.

This patch also improves the support of get_modifiable_text(), removing
a leading newline inside a LISTING, PRE, or TEXTAREA element.

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

Props dmsnell, jonsurrell, westonruter.
See #61576.

File:

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

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

@@ -32 +32 @@
          */
         const SKIP_TESTS = array(
-                'adoption01/line0046'       => 'Unimplemented: Reconstruction of active formatting elements.',
-                'adoption01/line0159'       => 'Unimplemented: Reconstruction of active formatting elements.',
-                'adoption01/line0318'       => 'Unimplemented: Reconstruction of active formatting elements.',
-                'inbody01/line0001'         => 'Bug.',
-                'inbody01/line0014'         => 'Bug.',
-                'inbody01/line0029'         => 'Bug.',
-                'menuitem-element/line0012' => 'Bug.',
-                'tests1/line0342'           => "Closing P tag implicitly creates opener, which we don't visit.",
-                'tests1/line0720'           => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests15/line0001'          => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests15/line0022'          => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests2/line0650'           => 'Whitespace only test never enters "in body" parsing mode.',
-                'tests20/line0497'          => "Closing P tag implicitly creates opener, which we don't visit.",
-                'tests23/line0001'          => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests23/line0041'          => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests23/line0069'          => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests23/line0101'          => 'Unimplemented: Reconstruction of active formatting elements.',
-                'tests25/line0169'          => 'Bug.',
-                'tests26/line0263'          => 'Bug: An active formatting element should be created for a trailing text node.',
+                'adoption01/line0046' => 'Unimplemented: Reconstruction of active formatting elements.',
+                'adoption01/line0159' => 'Unimplemented: Reconstruction of active formatting elements.',
+                'adoption01/line0318' => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests1/line0720'     => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests15/line0001'    => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests15/line0022'    => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests15/line0068'    => 'Unimplemented: no support outside of IN BODY yet.',
+                'tests2/line0650'     => 'Whitespace only test never enters "in body" parsing mode.',
+                'tests19/line0965'    => 'Unimplemented: no support outside of IN BODY yet.',
+                'tests23/line0001'    => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests23/line0041'    => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests23/line0069'    => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests23/line0101'    => 'Unimplemented: Reconstruction of active formatting elements.',
+                'tests26/line0263'    => 'Bug: An active formatting element should be created for a trailing text node.',
+                'webkit01/line0231'   => 'Unimplemented: This parser does not add missing attributes to existing HTML or BODY tags.',
+                'webkit02/line0013'   => "Asserting behavior with scripting flag enabled, which this parser doesn't support.",
+                'webkit01/line0300'   => 'Unimplemented: no support outside of IN BODY yet.',
+                'webkit01/line0310'   => 'Unimplemented: no support outside of IN BODY yet.',
+                'webkit01/line0336'   => 'Unimplemented: no support outside of IN BODY yet.',
+                'webkit01/line0349'   => 'Unimplemented: no support outside of IN BODY yet.',
+                'webkit01/line0362'   => 'Unimplemented: no support outside of IN BODY yet.',
+                'webkit01/line0375'   => 'Unimplemented: no support outside of IN BODY yet.',
         );
 
@@ -199 +202 @@
                                                         $output .= str_repeat( $indent, $tag_indent + 1 ) . "{$attribute_name}=\"{$val}\"\n";
                                                 }
-
-                                                // Self-contained tags contain their inner contents as modifiable text.
-                                                $modifiable_text = $processor->get_modifiable_text();
-                                                if ( '' !== $modifiable_text ) {
-                                                        $was_text = true;
-                                                        if ( '' === $text_node ) {
-                                                                $text_node = str_repeat( $indent, $indent_level ) . '"';
-                                                        }
-                                                        $text_node .= $modifiable_text;
-                                                        --$indent_level;
-                                                }
+                                        }
+
+                                        // Self-contained tags contain their inner contents as modifiable text.
+                                        $modifiable_text = $processor->get_modifiable_text();
+                                        if ( '' !== $modifiable_text ) {
+                                                $output .= str_repeat( $indent, $indent_level ) . "\"{$modifiable_text}\"\n";
+                                        }
+
+                                        if ( ! $processor->is_void( $tag_name ) && ! $processor->expects_closer() ) {
+                                                --$indent_level;
                                         }
 
@@ -226 +228 @@
                                                 case WP_HTML_Processor::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT:
                                                 case WP_HTML_Processor::COMMENT_AS_HTML_COMMENT:
+                                                case WP_HTML_Processor::COMMENT_AS_INVALID_HTML:
                                                         $comment_text_content = $processor->get_modifiable_text();
                                                         break;