Changeset 56331 for trunk

Timestamp:

08/01/2023 07:54:54 AM (3 years ago)

Author:

Bernhard Reiter

Message:

HTML API: Add support for SPAN element.

In this patch we're introducing support for the SPAN element, which is the first
in the class of "any other tag" in the "in body" insertion mode.

This patch introduces the mechanisms required to handle that class of tags but
only introduces SPAN to keep the change focused. With the tests and mechanisms
in place it will be possible to follow-up and add another limited set of tags.

It's important that this not use the default catch-all in the switch handling
step_in_body because that would catch tags that have specific rules in previous
case statements that aren't yet added. For example, we don't want to treat the
TABLE element as "any other tag".

Props dmsnell.
Fixes #58907.

Location:

trunk

Files:

• src/wp-includes/html-api/class-wp-html-processor.php (modified) (3 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php (modified) (2 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php (added)
• tests/phpunit/tests/html-api/wpHtmlSupportRequiredHtmlProcessor.php (added)

trunk/src/wp-includes/html-api/class-wp-html-processor.php

@@ -627 +627 @@
                                 return true;
 
+                        /*
+                         * > Any other start tag
+                         */
+                        case '+SPAN':
+                                $this->reconstruct_active_formatting_elements();
+                                $this->insert_html_element( $this->current_token );
+                                return true;
+
+                        /*
+                         * Any other end tag
+                         */
+                        case '-SPAN':
+                                foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+                                        // > If node is an HTML element with the same tag name as the token, then:
+                                        if ( $item->node_name === $tag_name ) {
+                                                $this->generate_implied_end_tags( $tag_name );
+
+                                                // > If node is not the current node, then this is a parse error.
+
+                                                $this->state->stack_of_open_elements->pop_until( $tag_name );
+                                                return true;
+                                        }
+
+                                        // > Otherwise, if node is in the special category, then this is a parse error; ignore the token, and return.
+                                        if ( self::is_special( $item->node_name ) ) {
+                                                return $this->step();
+                                        }
+                                }
+                                // Execution should not reach here; if it does then something went wrong.
+                                return false;
+
                         default:
                                 $this->last_error = self::ERROR_UNSUPPORTED;
@@ -874 +905 @@
          * @since 6.4.0
          *
-         * @throws Exception
+         * @throws WP_HTML_Unsupported_Exception
          *
          * @see https://html.spec.whatwg.org/#generate-implied-end-tags
@@ -890 +921 @@
                         in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true )
                 ) {
+                        $this->state->stack_of_open_elements->pop();
+                }
+        }
+
+        /*
+         * Closes elements that have implied end tags, thoroughly.
+         *
+         * See the HTML specification for an explanation why this is
+         * different from {@see WP_HTML_Processor::generate_implied_end_tags}.
+         *
+         * @since 6.4.0
+         *
+         * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+         */
+        private function generate_implied_end_tags_thoroughly() {
+                $elements_with_implied_end_tags = array(
+                        'P',
+                );
+
+                while ( in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true ) ) {
                         $this->state->stack_of_open_elements->pop();
                 }

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

@@ -50 +50 @@
                         'P',
                         'SMALL',
+                        'SPAN',
                         'STRIKE',
                         'STRONG',
@@ -192 +193 @@
                         'SOURCE',
                         'SPACER', // Deprecated
-                        'SPAN',
                         'STYLE',
                         'SUB',