Changeset 58679

Timestamp:

07/05/2024 04:37:41 PM (4 weeks ago)

Author:

dmsnell

Message:

HTML API: Stub out remaining insertion modes in the HTML Processor.

As part of work to add more spec support to the HTML API, this patch adds
stubs for all of the remaining parser insertion modes in the HTML Processor.
These modes are not all supported yet, but they will be necessary to continue
adding support for other tags and markup.

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

Props dmsnell, jonsurrell.
See #61576.

Location:

trunk/src/wp-includes/html-api

Files:

• class-wp-html-processor-state.php (modified) (4 diffs)
• class-wp-html-processor.php (modified) (5 diffs)

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

@@ -49 +49 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * In body insertion mode for full HTML parser.
      *
@@ -61 +121 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * In select insertion mode for full HTML parser.
      *
@@ -85 +229 @@
 
     /**
-     * In table insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-intable
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_TABLE = 'insertion-mode-in-table';
-
-    /**
-     * In caption insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-incaption
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_CAPTION = 'insertion-mode-in-caption';
-
-    /**
-     * In table body insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-intablebody
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_TABLE_BODY = 'insertion-mode-in-table-body';
-
-    /**
-     * In row insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-inrow
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_ROW = 'insertion-mode-in-row';
-
-    /**
-     * In cell insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-incell
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_CELL = 'insertion-mode-in-cell';
-
-    /**
-     * In column group insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-incolumngroup
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_COLUMN_GROUP = 'insertion-mode-in-column-group';
+     * In template insertion mode for full HTML parser.
+     *
+     * @since 6.7.0
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-intemplate
+     * @see WP_HTML_Processor_State::$insertion_mode
+     *
+     * @var string
+     */
+    const INSERTION_MODE_IN_TEMPLATE = 'insertion-mode-in-template';
+
+    /**
+     * After body insertion mode for full HTML parser.
+     *
+     * @since 6.7.0
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-afterbody
+     * @see WP_HTML_Processor_State::$insertion_mode
+     *
+     * @var string
+     */
+    const INSERTION_MODE_AFTER_BODY = 'insertion-mode-after-body';
 
     /**
@@ -169 +265 @@
 
     /**
-     * In head insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-inhead
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_HEAD = 'insertion-mode-in-head';
-
-    /**
-     * Before head insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-beforehead
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_BEFORE_HEAD = 'insertion-mode-before-head';
-
-    /**
-     * After head insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-afterhead
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_AFTER_HEAD = 'insertion-mode-after-head';
-
-    /**
-     * In template insertion mode for full HTML parser.
-     *
-     * @since 6.7.0
-     *
-     * @see https://html.spec.whatwg.org/#parsing-main-intemplate
-     * @see WP_HTML_Processor_State::$insertion_mode
-     *
-     * @var string
-     */
-    const INSERTION_MODE_IN_TEMPLATE = 'insertion-mode-in-template';
+     *  insertion mode for full HTML parser.
+     *
+     * @since 6.7.0
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-
+     * @see WP_HTML_Processor_State::$insertion_mode
+     *
+     * @var string
+     */
+    const INSERTION_MODE_';
+
+    /**
+     *  insertion mode for full HTML parser.
+     *
+     * @since 6.7.0
+     *
+     * @see https://html.spec.whatwg.org/#
+     * @see WP_HTML_Processor_State::$insertion_mode
+     *
+     * @var string
+     */
+    const INSERTION_MODE_';
+
+    /**
+     * After  insertion mode for full HTML parser.
+     *
+     * @since 6.7.0
+     *
+     * @see https://html.spec.whatwg.org/#
+     * @see WP_HTML_Processor_State::$insertion_mode
+     *
+     * @var string
+     */
+    const INSERTION_MODE_AFTER_';
+
+    /**
+     * In  insertion mode for full HTML parser.
+     *
+     * @since 6.7.0
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-in
+     * @see WP_HTML_Processor_State::$insertion_mode
+     *
+     * @var string
+     */
+    const INSERTION_MODE_IN_';
 
     /**

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

@@ -755 +755 @@
         try {
             switch ( $this->state->insertion_mode ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 case WP_HTML_Processor_State::INSERTION_MODE_IN_BODY:
                     return $this->step_in_body();
 
-                case WP_HTML_Processor_State::INSERTION_MODE_IN_HEAD:
-                    return $this->step_in_head();
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_TABLE:
+                    return $this->step_in_table();
+
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_TABLE_TEXT:
+                    return $this->step_in_table_text();
+
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_CAPTION:
+                    return $this->step_in_caption();
+
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_COLUMN_GROUP:
+                    return $this->step_in_column_group();
+
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_TABLE_BODY:
+                    return $this->step_in_table_body();
+
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_ROW:
+                    return $this->step_in_row();
+
+                case WP_HTML_Processor_State::INSERTION_MODE_IN_CELL:
+                    return $this->step_in_cell();
 
                 case WP_HTML_Processor_State::INSERTION_MODE_IN_SELECT:
                     return $this->step_in_select();
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 default:
                     $this->last_error = self::ERROR_UNSUPPORTED;
-                    throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+                    throw new WP_HTML_Unsupported_Exception( "." );
             }
         } catch ( WP_HTML_Unsupported_Exception $e ) {
@@ -869 +930 @@
             ? count( $this->get_breadcrumbs() )
             : $this->state->stack_of_open_elements->count();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -1495 +1676 @@
 
     /**
-     * Parses next element in the 'in head' insertion mode.
-     *
-     * This internal function performs the 'in head' insertion mode
+     * Parses next element in the 'in ' insertion mode.
+     *
+     * This internal function performs the 'in ' insertion mode
      * logic for the generalized WP_HTML_Processor::step() function.
      *
@@ -1504 +1685 @@
      * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
      *
-     * @see https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inhead
+     * @see https://html.spec.whatwg.org/
      * @see WP_HTML_Processor::step
      *
      * @return bool Whether an element was found.
      */
-    private function step_in_head() {
+    private function step_in_table() {
+        $this->last_error = self::ERROR_UNSUPPORTED;
+        throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+    }
+
+    /**
+     * Parses next element in the 'in table text' insertion mode.
+     *
+     * This internal function performs the 'in table text' insertion mode
+     * logic for the generalized WP_HTML_Processor::step() function.
+     *
+     * @since 6.7.0 Stub implementation.
+     *
+     * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-intabletext
+     * @see WP_HTML_Processor::step
+     *
+     * @return bool Whether an element was found.
+     */
+    private function step_in_table_text() {
+        $this->last_error = self::ERROR_UNSUPPORTED;
+        throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+    }
+
+    /**
+     * Parses next element in the 'in caption' insertion mode.
+     *
+     * This internal function performs the 'in caption' insertion mode
+     * logic for the generalized WP_HTML_Processor::step() function.
+     *
+     * @since 6.7.0 Stub implementation.
+     *
+     * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-incaption
+     * @see WP_HTML_Processor::step
+     *
+     * @return bool Whether an element was found.
+     */
+    private function step_in_caption() {
+        $this->last_error = self::ERROR_UNSUPPORTED;
+        throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+    }
+
+    /**
+     * Parses next element in the 'in column group' insertion mode.
+     *
+     * This internal function performs the 'in column group' insertion mode
+     * logic for the generalized WP_HTML_Processor::step() function.
+     *
+     * @since 6.7.0 Stub implementation.
+     *
+     * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-incolgroup
+     * @see WP_HTML_Processor::step
+     *
+     * @return bool Whether an element was found.
+     */
+    private function step_in_column_group() {
+        $this->last_error = self::ERROR_UNSUPPORTED;
+        throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+    }
+
+    /**
+     * Parses next element in the 'in table body' insertion mode.
+     *
+     * This internal function performs the 'in table body' insertion mode
+     * logic for the generalized WP_HTML_Processor::step() function.
+     *
+     * @since 6.7.0 Stub implementation.
+     *
+     * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-intbody
+     * @see WP_HTML_Processor::step
+     *
+     * @return bool Whether an element was found.
+     */
+    private function step_in_table_body() {
+        $this->last_error = self::ERROR_UNSUPPORTED;
+        throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+    }
+
+    /**
+     * Parses next element in the 'in row' insertion mode.
+     *
+     * This internal function performs the 'in row' insertion mode
+     * logic for the generalized WP_HTML_Processor::step() function.
+     *
+     * @since 6.7.0 Stub implementation.
+     *
+     * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-intr
+     * @see WP_HTML_Processor::step
+     *
+     * @return bool Whether an element was found.
+     */
+    private function step_in_row() {
+        $this->last_error = self::ERROR_UNSUPPORTED;
+        throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+    }
+
+    /**
+     * Parses next element in the 'in cell' insertion mode.
+     *
+     * This internal function performs the 'in cell' insertion mode
+     * logic for the generalized WP_HTML_Processor::step() function.
+     *
+     * @since 6.7.0 Stub implementation.
+     *
+     * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+     *
+     * @see https://html.spec.whatwg.org/#parsing-main-intd
+     * @see WP_HTML_Processor::step
+     *
+     * @return bool Whether an element was found.
+     */
+    private function step_in_cell() {
         $this->last_error = self::ERROR_UNSUPPORTED;
         throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
@@ -1693 +1994 @@
          */
         return $this->step();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }