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

Timestamp:

08/10/2023 08:35:55 AM (3 years ago)

Author:

Bernhard Reiter

Message:

HTML API: Add support for BUTTON element.

This patch adds support to process the BUTTON element. This requires adding some additional semantic rules to handle situations where a BUTTON element is already in scope.

Also included is a fixup to enforce that WP_HTML_Processor::next_tag() never returns for a tag closer. This is useful with the Tag Processor, but not for the HTML Processor. There were tests relying on this behavior to assert that internal processes were working as they should, but those tests have been updated to use the semi-private step() function, which does stop on tag closers.

This patch is one in a series of changes to expand support within the HTML API, moving gradually to allow for more focused changes that are easier to review and test. The HTML Processor is a work in progress with a certain set of features slated to be ready and tested by 6.4.0, but it will only contain partial support of the HTML5 specification even after that. Whenever it cannot positively recognize and process its input it bails, and certain function stubs and logical stubs exist to structure future expansions of support.

Props dmsnell.
Fixes #58961.

File:

• trunk/src/wp-includes/html-api/class-wp-html-processor.php (modified) (7 diffs)

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

@@ -350 +350 @@
         public function next_tag( $query = null ) {
                 if ( null === $query ) {
-                        return $this->step();
+                        while ( $this->step() ) {
+                                if ( ! $this->is_tag_closer() ) {
+                                        return true;
+                                }
+                        }
+
+                        return false;
                 }
 
@@ -367 +373 @@
 
                 if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
-                        return $this->step();
+                        while ( $this->step() ) {
+                                if ( ! $this->is_tag_closer() ) {
+                                        return true;
+                                }
+                        }
+
+                        return false;
                 }
 
@@ -384 +396 @@
                 $crumb  = end( $breadcrumbs );
                 $target = strtoupper( $crumb );
-                while ( $this->step() ) {
+                while ( $match_offset > 0 && $this->step() ) {
                         if ( $target !== $this->get_tag() ) {
                                 continue;
@@ -396 +408 @@
 
                                 $crumb = prev( $breadcrumbs );
-                                if ( false === $crumb && 0 === --$match_offset ) {
+                                if ( false === $crumb && 0 === --$match_offset && ! $this->is_tag_closer() ) {
                                         return true;
                                 }
@@ -511 +523 @@
 
                 switch ( $op ) {
+                        /*
+                         * > A start tag whose tag name is "button"
+                         */
+                        case '+BUTTON':
+                                if ( $this->state->stack_of_open_elements->has_element_in_scope( 'BUTTON' ) ) {
+                                        // @TODO: Indicate a parse error once it's possible. This error does not impact the logic here.
+                                        $this->generate_implied_end_tags();
+                                        $this->state->stack_of_open_elements->pop_until( 'BUTTON' );
+                                }
+
+                                $this->reconstruct_active_formatting_elements();
+                                $this->insert_html_element( $this->current_token );
+                                $this->state->frameset_ok = false;
+
+                                return true;
+
                         /*
                          * > A start tag whose tag name is one of: "address", "article", "aside",
@@ -536 +564 @@
                          */
                         case '-BLOCKQUOTE':
+                        case '-BUTTON':
                         case '-DIV':
                         case '-FIGCAPTION':
                         case '-FIGURE':
                                 if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $tag_name ) ) {
+                                        // @TODO: Report parse error.
                                         // Ignore the token.
                                         return $this->step();
@@ -545 +575 @@
 
                                 $this->generate_implied_end_tags();
+                                if ( $this->state->stack_of_open_elements->current_node()->node_name !== $tag_name ) {
+                                        // @TODO: Record parse error: this error doesn't impact parsing.
+                                }
                                 $this->state->stack_of_open_elements->pop_until( $tag_name );
                                 return true;