Changeset 57317

Timestamp:

01/19/2024 10:05:37 PM (9 months ago)

Author:

dmsnell

Message:

HTML API: Add support for PRE and LISTING elements.

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

• PRE, LISTING

Previously, these elements were not supported and the HTML Processor would bail when encountering them. Now, with this patch applied, it will proceed to parse an HTML document when encountering those tags.

Developed in WordPress/wordpress-develop#5903

Props jonsurrell, dmsnell
Fixes #60283

Location:

trunk

Files:

• src/wp-includes/html-api/class-wp-html-processor.php (modified) (6 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessor.php (modified) (2 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php (modified) (2 diffs)

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

@@ -103 +103 @@
  *  - Custom elements: All custom elements are supported. :)
  *  - Form elements: BUTTON, DATALIST, FIELDSET, LABEL, LEGEND, METER, PROGRESS, SEARCH.
- *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U, WBR.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, PRE, SMALL, STRIKE, STRONG, TT, U, WBR.
  *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
  *  - Links: A.
@@ -113 +113 @@
  *  - Templating elements: SLOT.
  *  - Text decoration: RUBY.
- *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, MULTICOL, NEXTID, SPACER.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, LISTING, MULTICOL, NEXTID, SPACER.
  *
  * ### Supported markup
@@ -685 +685 @@
             case '-HEADER':
             case '-HGROUP':
+            case '-LISTING':
             case '-MAIN':
             case '-MENU':
             case '-NAV':
             case '-OL':
+            case '-PRE':
             case '-SEARCH':
             case '-SECTION':
@@ -731 +733 @@
 
                 $this->insert_html_element( $this->state->current_token );
+                return true;
+
+            /*
+             * > A start tag whose tag name is one of: "pre", "listing"
+             */
+            case '+PRE':
+            case '+LISTING':
+                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;
 
@@ -1008 +1022 @@
             case 'LI':
             case 'LINK':
-            case 'LISTING':
             case 'MARQUEE':
             case 'MATH':
@@ -1022 +1035 @@
             case 'PARAM':
             case 'PLAINTEXT':
-            case 'PRE':
             case 'RB':
             case 'RP':

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

@@ -255 +255 @@
             'INPUT'     => array( 'INPUT' ),
             'LINK'      => array( 'LINK' ),
-            'LISTING'   => array( 'LISTING' ),
             'MARQUEE'   => array( 'MARQUEE' ),
             'MATH'      => array( 'MATH' ),
@@ -268 +267 @@
             'PARAM'     => array( 'PARAM' ),
             'PLAINTEXT' => array( 'PLAINTEXT' ),
-            'PRE'       => array( 'PRE' ),
             'RB'        => array( 'RB' ),
             'RP'        => array( 'RP' ),

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

@@ -177 +177 @@
             'INPUT',
             'LINK',
-            'LISTING', // Deprecated, use PRE instead.
             'MARQUEE', // Deprecated.
             'MATH',
@@ -189 +188 @@
             'OPTION',
             'PLAINTEXT', // Neutralized.
-            'PRE',
             'RB', // Neutralized.
             'RP',