Changeset 57314

Timestamp:

01/19/2024 07:01:29 PM (3 years ago)

Author:

dmsnell

Message:

HTML API: Add support for HR element.

Adds support for the following HTML elements to the HTML Processor:

• HR

Previously, this element was not supported and the HTML Processor would bail when encountering
it. Now, with this patch, it will proceed to parse an HTML document when encountering one.

Developed in WordPress/wordpress-develop#5897

Props jonsurrell, dmsnell
Fixes #60283

Location:

trunk

Files:

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

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

@@ -110 +110 @@
  *  - Paragraph: P.
  *  - Phrasing elements: ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
- *  - Sectioning elements: ARTICLE, ASIDE, NAV, SECTION.
+ *  - Sectioning elements: ARTICLE, ASIDE, HR, NAV, SECTION.
  *  - Templating elements: SLOT.
  *  - Text decoration: RUBY.
@@ -941 +941 @@
                                 $this->reconstruct_active_formatting_elements();
                                 $this->insert_html_element( $this->state->current_token );
+                                return true;
+
+                        /*
+                         * > A start tag whose tag name is "hr"
+                         */
+                        case '+HR':
+                                if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+                                        $this->close_a_p_element();
+                                }
+                                $this->insert_html_element( $this->state->current_token );
+                                $this->state->frameset_ok = false;
                                 return true;
                 }
@@ -978 +989 @@
                         case 'FRAMESET':
                         case 'HEAD':
-                        case 'HR':
                         case 'HTML':
                         case 'IFRAME':

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

@@ -174 +174 @@
                         'FRAMESET'  => array( 'FRAMESET' ),
                         'HEAD'      => array( 'HEAD' ),
-                        'HR'        => array( 'HR' ),
                         'HTML'      => array( 'HTML' ),
                         'IFRAME'    => array( 'IFRAME' ),

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

@@ -176 +176 @@
                         'FRAMESET',
                         'HEAD',
-                        'HR',
                         'HTML',
                         'IFRAME',

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

@@ -226 +226 @@
 
         /**
+         * Verifies that HR closes an open p tag
+         *
+         * @ticket 60283
+         */
+        public function test_in_body_hr_element_closes_open_p_tag() {
+                $processor = WP_HTML_Processor::create_fragment( '<p><hr>' );
+
+                $processor->next_tag( 'HR' );
+                $this->assertSame(
+                        array( 'HTML', 'BODY', 'HR' ),
+                        $processor->get_breadcrumbs(),
+                        'Expected HR to be a direct child of the BODY, having closed the open P element.'
+                );
+        }
+
+        /**
          * Verifies that H1 through H6 elements close an open P element.
          *