Changeset 58364

Timestamp:

06/08/2024 11:10:58 AM (12 months ago)

Author:

dmsnell

Message:

HTML API: Fix three small type-related bugs.

This applies three fixes that appeared as part of
adding type annotations to the HTML API.

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

Props jonsurrell.
See #61399.
Follow-up to [55203], [56274].

Location:

trunk/src/wp-includes/html-api

Files:

• class-wp-html-processor.php (modified) (1 diff)
• class-wp-html-tag-processor.php (modified) (3 diffs)

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

@@ -544 +544 @@
         if (
             WP_HTML_Stack_Event::POP === $this->current_element->operation &&
-            ! static::expects_closer( $this->current_element->token->node_name )
+            ! static::expects_closer( $this->current_element->token )
         ) {
             return $this->next_token();

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

@@ -2266 +2266 @@
      * @return int How many bytes the given pointer moved in response to the updates.
      */
-    private function apply_attributes_updates( $shift_this_point = 0 ) {
+    private function apply_attributes_updates( $shift_this_point ) {
         if ( ! count( $this->lexical_updates ) ) {
             return 0;
@@ -2788 +2788 @@
                 return '#funky-comment';
         }
+
+        return null;
     }
 
@@ -3196 +3198 @@
          * be necessary for reparsing the current tag after updating the HTML.
          */
-        $before_current_tag = $this->token_starts_at;
+        $before_current_tag = $this->token_starts_at ?? 0;
 
         /*