%2$s%3$s
',
diff --git a/src/wp-includes/blocks/comment-content/block.json b/src/wp-includes/blocks/comment-content/block.json
index 0c28c25f330ca..69917ccce6aea 100644
--- a/src/wp-includes/blocks/comment-content/block.json
+++ b/src/wp-includes/blocks/comment-content/block.json
@@ -14,6 +14,7 @@
}
},
"supports": {
+ "anchor": true,
"color": {
"gradients": true,
"link": true,
diff --git a/src/wp-includes/blocks/comment-date.php b/src/wp-includes/blocks/comment-date.php
index 9bff9f2f6cbbf..0f9c18bf2c006 100644
--- a/src/wp-includes/blocks/comment-date.php
+++ b/src/wp-includes/blocks/comment-date.php
@@ -23,7 +23,7 @@ function render_block_core_comment_date( $attributes, $content, $block ) {
return '';
}
- $classes = '';
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
$formatted_date = get_comment_date(
diff --git a/src/wp-includes/blocks/comment-date/block.json b/src/wp-includes/blocks/comment-date/block.json
index e90cb0b0d8c4d..ea1e263338139 100644
--- a/src/wp-includes/blocks/comment-date/block.json
+++ b/src/wp-includes/blocks/comment-date/block.json
@@ -18,6 +18,7 @@
},
"usesContext": [ "commentId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/comment-edit-link.php b/src/wp-includes/blocks/comment-edit-link.php
index 39727ea5aed10..ce7ad9bf207d4 100644
--- a/src/wp-includes/blocks/comment-edit-link.php
+++ b/src/wp-includes/blocks/comment-edit-link.php
@@ -27,12 +27,15 @@ function render_block_core_comment_edit_link( $attributes, $content, $block ) {
$link_atts .= sprintf( 'target="%s"', esc_attr( $attributes['linkTarget'] ) );
}
- $classes = '';
+ $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= 'has-text-align-' . $attributes['textAlign'];
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
+ }
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
return sprintf(
'',
diff --git a/src/wp-includes/blocks/comment-edit-link/block.json b/src/wp-includes/blocks/comment-edit-link/block.json
index 14795c83e1c53..e695ddc3801f7 100644
--- a/src/wp-includes/blocks/comment-edit-link/block.json
+++ b/src/wp-includes/blocks/comment-edit-link/block.json
@@ -18,6 +18,7 @@
}
},
"supports": {
+ "anchor": true,
"html": false,
"color": {
"link": true,
diff --git a/src/wp-includes/blocks/comment-reply-link.php b/src/wp-includes/blocks/comment-reply-link.php
index 169b62ac24bdf..3f7b6e48b617c 100644
--- a/src/wp-includes/blocks/comment-reply-link.php
+++ b/src/wp-includes/blocks/comment-reply-link.php
@@ -34,7 +34,7 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
// Compute comment's depth iterating over its ancestors.
while ( ! empty( $parent_id ) ) {
- $depth++;
+ ++$depth;
$parent_id = get_comment( $parent_id )->comment_parent;
}
@@ -51,12 +51,15 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
return;
}
- $classes = '';
+ $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= 'has-text-align-' . $attributes['textAlign'];
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
+ }
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
return sprintf(
'%2$s
',
diff --git a/src/wp-includes/blocks/comment-reply-link/block.json b/src/wp-includes/blocks/comment-reply-link/block.json
index 9d4a1d8668acc..7ed60f34f581f 100644
--- a/src/wp-includes/blocks/comment-reply-link/block.json
+++ b/src/wp-includes/blocks/comment-reply-link/block.json
@@ -14,6 +14,7 @@
}
},
"supports": {
+ "anchor": true,
"color": {
"gradients": true,
"link": true,
diff --git a/src/wp-includes/blocks/comment-template.php b/src/wp-includes/blocks/comment-template.php
index 770959854b58a..08620a3ea695f 100644
--- a/src/wp-includes/blocks/comment-template.php
+++ b/src/wp-includes/blocks/comment-template.php
@@ -50,13 +50,13 @@ function block_core_comment_template_render_comments( $comments, $block ) {
// comments.
if ( ! empty( $children ) && ! empty( $thread_comments ) ) {
if ( $comment_depth < $thread_comments_depth ) {
- $comment_depth += 1;
+ ++$comment_depth;
$inner_content = block_core_comment_template_render_comments(
$children,
$block
);
$block_content .= sprintf( '- %1$s
%2$s
',
- get_block_wrapper_attributes(),
+ $wrapper_attributes,
$content
);
}
diff --git a/src/wp-includes/blocks/comments-pagination/block.json b/src/wp-includes/blocks/comments-pagination/block.json
index ffa2828912f26..d7c8be4b8eaa2 100644
--- a/src/wp-includes/blocks/comments-pagination/block.json
+++ b/src/wp-includes/blocks/comments-pagination/block.json
@@ -17,6 +17,7 @@
"comments/paginationArrow": "paginationArrow"
},
"supports": {
+ "anchor": true,
"align": true,
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/comments.php b/src/wp-includes/blocks/comments.php
index 69044c081c74e..a5e51cfbf4e79 100644
--- a/src/wp-includes/blocks/comments.php
+++ b/src/wp-includes/blocks/comments.php
@@ -202,7 +202,6 @@ function register_legacy_post_comments_block() {
'wp-block-buttons',
'wp-block-button',
),
- 'editorStyle' => 'wp-block-post-comments-editor',
'render_callback' => 'render_block_core_comments',
'skip_inner_blocks' => true,
);
diff --git a/src/wp-includes/blocks/comments/block.json b/src/wp-includes/blocks/comments/block.json
index 59d315b5fcb83..19490f6e99eb4 100644
--- a/src/wp-includes/blocks/comments/block.json
+++ b/src/wp-includes/blocks/comments/block.json
@@ -18,6 +18,7 @@
},
"supports": {
"align": [ "wide", "full" ],
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
@@ -28,6 +29,10 @@
"link": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/cover.php b/src/wp-includes/blocks/cover.php
index 4168d267671f7..e5a497fd76889 100644
--- a/src/wp-includes/blocks/cover.php
+++ b/src/wp-includes/blocks/cover.php
@@ -25,7 +25,7 @@ function render_block_core_cover( $attributes, $content ) {
);
if ( isset( $attributes['focalPoint'] ) ) {
- $object_position = round( $attributes['focalPoint']['x'] * 100 ) . '%' . ' ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
+ $object_position = round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
$attr['data-object-position'] = $object_position;
$attr['style'] = 'object-position: ' . $object_position;
}
diff --git a/src/wp-includes/blocks/cover/block.json b/src/wp-includes/blocks/cover/block.json
index 1982ecc44853e..3bcc779a0f127 100644
--- a/src/wp-includes/blocks/cover/block.json
+++ b/src/wp-includes/blocks/cover/block.json
@@ -74,6 +74,10 @@
"templateLock": {
"type": [ "string", "boolean" ],
"enum": [ "all", "insert", "contentOnly", false ]
+ },
+ "tagName": {
+ "type": "string",
+ "default": "div"
}
},
"usesContext": [ "postId", "postType" ],
diff --git a/src/wp-includes/blocks/embed/block.json b/src/wp-includes/blocks/embed/block.json
index 7257b54cf20fa..e36768cd72780 100644
--- a/src/wp-includes/blocks/embed/block.json
+++ b/src/wp-includes/blocks/embed/block.json
@@ -8,18 +8,22 @@
"textdomain": "default",
"attributes": {
"url": {
- "type": "string"
+ "type": "string",
+ "__experimentalRole": "content"
},
"caption": {
"type": "string",
"source": "html",
- "selector": "figcaption"
+ "selector": "figcaption",
+ "__experimentalRole": "content"
},
"type": {
- "type": "string"
+ "type": "string",
+ "__experimentalRole": "content"
},
"providerNameSlug": {
- "type": "string"
+ "type": "string",
+ "__experimentalRole": "content"
},
"allowResponsive": {
"type": "boolean",
@@ -27,11 +31,13 @@
},
"responsive": {
"type": "boolean",
- "default": false
+ "default": false,
+ "__experimentalRole": "content"
},
"previewable": {
"type": "boolean",
- "default": true
+ "default": true,
+ "__experimentalRole": "content"
}
},
"supports": {
diff --git a/src/wp-includes/blocks/gallery.php b/src/wp-includes/blocks/gallery.php
index 7bc5e2821b796..ff1fb8ef42d89 100644
--- a/src/wp-includes/blocks/gallery.php
+++ b/src/wp-includes/blocks/gallery.php
@@ -76,13 +76,10 @@ function block_core_gallery_render( $attributes, $content ) {
}
}
- $class = wp_unique_id( 'wp-block-gallery-' );
- $content = preg_replace(
- '/' . preg_quote( 'class="', '/' ) . '/',
- 'class="' . $class . ' ',
- $content,
- 1
- );
+ $unique_gallery_classname = wp_unique_id( 'wp-block-gallery-' );
+ $processed_content = new WP_HTML_Tag_Processor( $content );
+ $processed_content->next_tag();
+ $processed_content->add_class( $unique_gallery_classname );
// --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default
// gap on the gallery.
@@ -102,10 +99,22 @@ function block_core_gallery_render( $attributes, $content ) {
}
// Set the CSS variable to the column value, and the `gap` property to the combined gap value.
- $style = '.wp-block-gallery.' . $class . '{ --wp--style--unstable-gallery-gap: ' . $gap_column . '; gap: ' . $gap_value . '}';
+ $gallery_styles = array();
+ $gallery_styles[] = array(
+ 'selector' => ".wp-block-gallery.{$unique_gallery_classname}",
+ 'declarations' => array(
+ '--wp--style--unstable-gallery-gap' => $gap_column,
+ 'gap' => $gap_value,
+ ),
+ );
- wp_enqueue_block_support_styles( $style, 11 );
- return $content;
+ gutenberg_style_engine_get_stylesheet_from_css_rules(
+ $gallery_styles,
+ array(
+ 'context' => 'block-supports',
+ )
+ );
+ return (string) $processed_content;
}
/**
* Registers the `core/gallery` block on server.
diff --git a/src/wp-includes/blocks/group/block.json b/src/wp-includes/blocks/group/block.json
index 968f00cb1c5cb..2b227a15847a2 100644
--- a/src/wp-includes/blocks/group/block.json
+++ b/src/wp-includes/blocks/group/block.json
@@ -41,6 +41,9 @@
"blockGap": true
}
},
+ "dimensions": {
+ "minHeight": true
+ },
"__experimentalBorder": {
"color": true,
"radius": true,
@@ -53,6 +56,9 @@
"width": true
}
},
+ "position": {
+ "sticky": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
@@ -66,7 +72,9 @@
"fontSize": true
}
},
- "__experimentalLayout": true
+ "__experimentalLayout": {
+ "allowSizingOnChildren": true
+ }
},
"editorStyle": "wp-block-group-editor",
"style": "wp-block-group"
diff --git a/src/wp-includes/blocks/heading.php b/src/wp-includes/blocks/heading.php
new file mode 100644
index 0000000000000..5a7e8dbaab43c
--- /dev/null
+++ b/src/wp-includes/blocks/heading.php
@@ -0,0 +1,52 @@
+Hello World
+ *
+ * Would be transformed to:
+ * Hello World
+ * + * @param array $attributes Attributes of the block being rendered. + * @param string $content Content of the block being rendered. + * + * @return string The content of the block being rendered. + */ +function block_core_heading_render( $attributes, $content ) { + if ( ! $content ) { + return $content; + } + + $p = new WP_HTML_Tag_Processor( $content ); + + $header_tags = array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ); + while ( $p->next_tag() ) { + if ( in_array( $p->get_tag(), $header_tags, true ) ) { + $p->add_class( 'wp-block-heading' ); + break; + } + } + + return $p->get_updated_html(); +} + +/** + * Registers the `core/heading` block on server. + */ +function register_block_core_heading() { + register_block_type_from_metadata( + __DIR__ . '/heading', + array( + 'render_callback' => 'block_core_heading_render', + ) + ); +} + +add_action( 'init', 'register_block_core_heading' ); diff --git a/src/wp-includes/blocks/heading/block.json b/src/wp-includes/blocks/heading/block.json index 89c1514808911..f9d701eace964 100644 --- a/src/wp-includes/blocks/heading/block.json +++ b/src/wp-includes/blocks/heading/block.json @@ -29,7 +29,7 @@ "supports": { "align": [ "wide", "full" ], "anchor": true, - "className": false, + "className": true, "color": { "gradients": true, "link": true, @@ -57,7 +57,6 @@ "textTransform": true } }, - "__experimentalSelector": "h1,h2,h3,h4,h5,h6", "__unstablePasteTextInline": true, "__experimentalSlashInserter": true }, diff --git a/src/wp-includes/blocks/home-link.php b/src/wp-includes/blocks/home-link.php index 5bf7aeda5505d..33f41057c936b 100644 --- a/src/wp-includes/blocks/home-link.php +++ b/src/wp-includes/blocks/home-link.php @@ -128,7 +128,7 @@ function render_block_core_home_link( $attributes, $content, $block ) { $aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : ''; return sprintf( - '- %2$s
- %2$s
- %2$s
%2$s
', $wrapper_attributes, $author_name );
+}
+
+/**
+ * Registers the `core/post-author-name` block on the server.
+ */
+function register_block_core_post_author_name() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-author-name',
+ array(
+ 'render_callback' => 'render_block_core_post_author_name',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_post_author_name' );
diff --git a/src/wp-includes/blocks/post-author-name/block.json b/src/wp-includes/blocks/post-author-name/block.json
new file mode 100644
index 0000000000000..2340636e0c63a
--- /dev/null
+++ b/src/wp-includes/blocks/post-author-name/block.json
@@ -0,0 +1,53 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 2,
+ "name": "core/post-author-name",
+ "title": "Post Author Name",
+ "category": "theme",
+ "description": "The author name.",
+ "textdomain": "default",
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self"
+ }
+ },
+ "usesContext": [ "postType", "postId" ],
+ "supports": {
+ "anchor": true,
+ "html": false,
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/post-author.php b/src/wp-includes/blocks/post-author.php
index 325aa43607d22..7e6a9e6a0bd85 100644
--- a/src/wp-includes/blocks/post-author.php
+++ b/src/wp-includes/blocks/post-author.php
@@ -29,11 +29,23 @@ function render_block_core_post_author( $attributes, $content, $block ) {
$attributes['avatarSize']
) : null;
+ $link = get_author_posts_url( $author_id );
+ $author_name = get_the_author_meta( 'display_name', $author_id );
+ if ( ! empty( $attributes['isLink'] && ! empty( $attributes['linkTarget'] ) ) ) {
+ $author_name = sprintf( '%2s', esc_url( $link ), esc_attr( $attributes['linkTarget'] ), $author_name );
+ }
+
$byline = ! empty( $attributes['byline'] ) ? $attributes['byline'] : false;
- $classes = array_merge(
- isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(),
- isset( $attributes['textAlign'] ) ? array( 'has-text-align-' . $attributes['textAlign'] ) : array()
- );
+ $classes = array();
+ if ( isset( $attributes['itemsJustification'] ) ) {
+ $classes[] = 'items-justified-' . $attributes['itemsJustification'];
+ }
+ if ( isset( $attributes['textAlign'] ) ) {
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
+ }
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
@@ -41,7 +53,7 @@ function render_block_core_post_author( $attributes, $content, $block ) {
( ! empty( $attributes['showAvatar'] ) ? '' : '' ) .
'' .
'';
diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json
index 232e20dbd0a8d..bb9f69ade07e6 100644
--- a/src/wp-includes/blocks/post-author/block.json
+++ b/src/wp-includes/blocks/post-author/block.json
@@ -23,10 +23,19 @@
},
"byline": {
"type": "string"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self"
}
},
"usesContext": [ "postType", "postId", "queryId" ],
"supports": {
+ "anchor": true,
"html": false,
"spacing": {
"margin": true,
diff --git a/src/wp-includes/blocks/post-comments-form.php b/src/wp-includes/blocks/post-comments-form.php
index 53a6f8b5242a9..644b02ae0f149 100644
--- a/src/wp-includes/blocks/post-comments-form.php
+++ b/src/wp-includes/blocks/post-comments-form.php
@@ -22,12 +22,14 @@ function render_block_core_post_comments_form( $attributes, $content, $block ) {
return;
}
- $classes = 'comment-respond'; // See comment further below.
+ $classes = array( 'comment-respond' ); // See comment further below.
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= ' has-text-align-' . $attributes['textAlign'];
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
}
-
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
add_filter( 'comment_form_defaults', 'post_comments_form_block_form_defaults' );
diff --git a/src/wp-includes/blocks/post-comments-form/block.json b/src/wp-includes/blocks/post-comments-form/block.json
index 47cc0a443baee..793d14d74ba7b 100644
--- a/src/wp-includes/blocks/post-comments-form/block.json
+++ b/src/wp-includes/blocks/post-comments-form/block.json
@@ -13,6 +13,7 @@
},
"usesContext": [ "postId", "postType" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
@@ -22,6 +23,10 @@
"text": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-content.php b/src/wp-includes/blocks/post-content.php
index 228a0d52f4069..2be1ef77b3b85 100644
--- a/src/wp-includes/blocks/post-content.php
+++ b/src/wp-includes/blocks/post-content.php
@@ -25,8 +25,7 @@ function render_block_core_post_content( $attributes, $content, $block ) {
if ( isset( $seen_ids[ $post_id ] ) ) {
// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
// is set in `wp_debug_mode()`.
- $is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
- defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+ $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
return $is_debug ?
// translators: Visible only in the front end, this warning takes the place of a faulty block.
diff --git a/src/wp-includes/blocks/post-content/block.json b/src/wp-includes/blocks/post-content/block.json
index c330f624ee142..56834a980baed 100644
--- a/src/wp-includes/blocks/post-content/block.json
+++ b/src/wp-includes/blocks/post-content/block.json
@@ -8,9 +8,13 @@
"textdomain": "default",
"usesContext": [ "postId", "postType", "queryId" ],
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"__experimentalLayout": true,
+ "dimensions": {
+ "minHeight": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-date.php b/src/wp-includes/blocks/post-date.php
index fc1537d156689..5c20ee30c2b39 100644
--- a/src/wp-includes/blocks/post-date.php
+++ b/src/wp-includes/blocks/post-date.php
@@ -18,9 +18,16 @@ function render_block_core_post_date( $attributes, $content, $block ) {
return '';
}
- $post_ID = $block->context['postId'];
- $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+ $post_ID = $block->context['postId'];
+
+ $classes = array();
+ if ( isset( $attributes['textAlign'] ) ) {
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
+ }
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
$formatted_date = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json
index b469dbe87d7e0..41c45a4a57e26 100644
--- a/src/wp-includes/blocks/post-date/block.json
+++ b/src/wp-includes/blocks/post-date/block.json
@@ -24,6 +24,7 @@
},
"usesContext": [ "postId", "postType", "queryId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/post-excerpt.php b/src/wp-includes/blocks/post-excerpt.php
index 79cc959cd86d7..1380918fe1058 100644
--- a/src/wp-includes/blocks/post-excerpt.php
+++ b/src/wp-includes/blocks/post-excerpt.php
@@ -38,11 +38,14 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
* result in showing only one `read more` link at a time.
*/
add_filter( 'excerpt_more', $filter_excerpt_more );
- $classes = '';
+ $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= "has-text-align-{$attributes['textAlign']}";
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
$content = '' . $excerpt;
$show_more_on_new_line = ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine'];
diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json
index 03107ff900e06..223b4c68bde0e 100644
--- a/src/wp-includes/blocks/post-excerpt/block.json
+++ b/src/wp-includes/blocks/post-excerpt/block.json
@@ -20,6 +20,7 @@
},
"usesContext": [ "postId", "postType", "queryId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php
index 068b7eeac6899..8da66accd3032 100644
--- a/src/wp-includes/blocks/post-featured-image.php
+++ b/src/wp-includes/blocks/post-featured-image.php
@@ -27,12 +27,19 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$is_link = isset( $attributes['isLink'] ) && $attributes['isLink'];
$size_slug = isset( $attributes['sizeSlug'] ) ? $attributes['sizeSlug'] : 'post-thumbnail';
- $post_title = trim( strip_tags( get_the_title( $post_ID ) ) );
$attr = get_block_core_post_featured_image_border_attributes( $attributes );
$overlay_markup = get_block_core_post_featured_image_overlay_element_markup( $attributes );
if ( $is_link ) {
- $attr['alt'] = $post_title;
+ if ( get_the_title( $post_ID ) ) {
+ $attr['alt'] = trim( strip_tags( get_the_title( $post_ID ) ) );
+ } else {
+ $attr['alt'] = sprintf(
+ // translators: %d is the post ID.
+ __( 'Untitled post %d' ),
+ $post_ID
+ );
+ }
}
if ( ! empty( $attributes['height'] ) ) {
@@ -50,11 +57,13 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
if ( $is_link ) {
$link_target = $attributes['linkTarget'];
$rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
+ $height = ! empty( $attributes['height'] ) ? 'style="' . esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . '"' : '';
$featured_image = sprintf(
- '%4$s%5$s',
+ '%5$s%6$s',
get_the_permalink( $post_ID ),
esc_attr( $link_target ),
$rel,
+ $height,
$featured_image,
$overlay_markup
);
@@ -62,10 +71,13 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$featured_image = $featured_image . $overlay_markup;
}
- $wrapper_attributes = empty( $attributes['width'] )
- ? get_block_wrapper_attributes()
- : get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) );
-
+ $width = ! empty( $attributes['width'] ) ? esc_attr( safecss_filter_attr( 'width:' . $attributes['width'] ) ) . ';' : '';
+ $height = ! empty( $attributes['height'] ) ? esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . ';' : '';
+ if ( ! $height && ! $width ) {
+ $wrapper_attributes = get_block_wrapper_attributes();
+ } else {
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'style' => $width . $height ) );
+ }
return "
";
if ( isset( $attributes['prefix'] ) && $attributes['prefix'] ) {
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index 26f3915d5b0e0..1633c7c01b82c 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -28,6 +28,7 @@
},
"usesContext": [ "postId", "postType" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
@@ -38,6 +39,10 @@
"link": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php
index 125a2d81ddcbe..1f03b12fc2b46 100644
--- a/src/wp-includes/blocks/post-title.php
+++ b/src/wp-includes/blocks/post-title.php
@@ -26,9 +26,7 @@ function render_block_core_post_title( $attributes, $content, $block ) {
return '';
}
- $tag_name = 'h2';
- $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
-
+ $tag_name = 'h2';
if ( isset( $attributes['level'] ) ) {
$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level'];
}
@@ -37,7 +35,15 @@ function render_block_core_post_title( $attributes, $content, $block ) {
$rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
$title = sprintf( '%4$s', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+
+ $classes = array();
+ if ( isset( $attributes['textAlign'] ) ) {
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
+ }
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
return sprintf(
'<%1$s %2$s>%3$s',
diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json
index 015896ff1bad0..4a56a6f37b779 100644
--- a/src/wp-includes/blocks/post-title/block.json
+++ b/src/wp-includes/blocks/post-title/block.json
@@ -31,6 +31,7 @@
},
"supports": {
"align": [ "wide", "full" ],
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/query-no-results.php b/src/wp-includes/blocks/query-no-results.php
index 6d4dad48f49e0..4342ba57cccbd 100644
--- a/src/wp-includes/blocks/query-no-results.php
+++ b/src/wp-includes/blocks/query-no-results.php
@@ -40,9 +40,11 @@ function render_block_core_query_no_results( $attributes, $content, $block ) {
wp_reset_postdata();
}
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
return sprintf(
'';
- $link .= '';
+ $link .= '';
$link .= $icon;
$link .= ' ';
- return $link;
+ $w = new WP_HTML_Tag_Processor( $link );
+ $w->next_tag( 'a' );
+ if ( $open_in_new_tab ) {
+ $w->set_attribute( 'rel', esc_attr( $rel ) . ' noopener nofollow' );
+ $w->set_attribute( 'target', '_blank' );
+ } elseif ( '' !== $rel ) {
+ $w->set_attribute( 'rel', esc_attr( $rel ) );
+ }
+ return $w;
}
/**
diff --git a/src/wp-includes/blocks/social-link/block.json b/src/wp-includes/blocks/social-link/block.json
index 90a3f270d738d..e81894591b4b3 100644
--- a/src/wp-includes/blocks/social-link/block.json
+++ b/src/wp-includes/blocks/social-link/block.json
@@ -16,6 +16,9 @@
},
"label": {
"type": "string"
+ },
+ "rel": {
+ "type": "string"
}
},
"usesContext": [
@@ -25,6 +28,7 @@
"iconBackgroundColorValue"
],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false
},
diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json
index 3de088e0879b7..adac1e9c2130e 100644
--- a/src/wp-includes/blocks/table/block.json
+++ b/src/wp-includes/blocks/table/block.json
@@ -47,6 +47,16 @@
"type": "string",
"source": "attribute",
"attribute": "data-align"
+ },
+ "colspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "colspan"
+ },
+ "rowspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "rowspan"
}
}
}
@@ -82,6 +92,16 @@
"type": "string",
"source": "attribute",
"attribute": "data-align"
+ },
+ "colspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "colspan"
+ },
+ "rowspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "rowspan"
}
}
}
@@ -117,6 +137,16 @@
"type": "string",
"source": "attribute",
"attribute": "data-align"
+ },
+ "colspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "colspan"
+ },
+ "rowspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "rowspan"
}
}
}
diff --git a/src/wp-includes/blocks/tag-cloud.php b/src/wp-includes/blocks/tag-cloud.php
index a7d121f7ca632..7ff5f78400db6 100644
--- a/src/wp-includes/blocks/tag-cloud.php
+++ b/src/wp-includes/blocks/tag-cloud.php
@@ -28,14 +28,7 @@ function render_block_core_tag_cloud( $attributes ) {
$tag_cloud = wp_tag_cloud( $args );
if ( ! $tag_cloud ) {
- $labels = get_taxonomy_labels( get_taxonomy( $attributes['taxonomy'] ) );
- $tag_cloud = esc_html(
- sprintf(
- /* translators: %s: taxonomy name */
- __( 'Your site doesn’t have any %s, so there’s nothing to display here at the moment.' ),
- strtolower( $labels->name )
- )
- );
+ $tag_cloud = __( 'There’s no content to show here yet.' );
}
$wrapper_attributes = get_block_wrapper_attributes();
diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json
index 69e14223f70fb..ec1e333512719 100644
--- a/src/wp-includes/blocks/tag-cloud/block.json
+++ b/src/wp-includes/blocks/tag-cloud/block.json
@@ -36,10 +36,19 @@
],
"supports": {
"html": false,
+ "anchor": true,
"align": true,
"spacing": {
"margin": true,
"padding": true
+ },
+ "typography": {
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalLetterSpacing": true
}
},
"editorStyle": "wp-block-tag-cloud-editor"
diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
index bef49341d7bb5..7c4cb693fde54 100644
--- a/src/wp-includes/blocks/template-part.php
+++ b/src/wp-includes/blocks/template-part.php
@@ -105,8 +105,7 @@ function render_block_core_template_part( $attributes ) {
// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
// is set in `wp_debug_mode()`.
- $is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
- defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+ $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
if ( is_null( $content ) && $is_debug ) {
if ( ! isset( $attributes['slug'] ) ) {
@@ -127,6 +126,21 @@ function render_block_core_template_part( $attributes ) {
'';
}
+ // Look up area definition.
+ $area_definition = null;
+ $defined_areas = get_allowed_block_template_part_areas();
+ foreach ( $defined_areas as $defined_area ) {
+ if ( $defined_area['area'] === $area ) {
+ $area_definition = $defined_area;
+ break;
+ }
+ }
+
+ // If $area is not allowed, set it back to the uncategorized default.
+ if ( ! $area_definition ) {
+ $area = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
+ }
+
// Run through the actions that are typically taken on the_content.
$seen_ids[ $template_part_id ] = true;
$content = do_blocks( $content );
@@ -134,7 +148,7 @@ function render_block_core_template_part( $attributes ) {
$content = wptexturize( $content );
$content = convert_smilies( $content );
$content = shortcode_unautop( $content );
- $content = wp_filter_content_tags( $content );
+ $content = wp_filter_content_tags( $content, "template_part_{$area}" );
$content = do_shortcode( $content );
// Handle embeds for block template parts.
@@ -142,12 +156,9 @@ function render_block_core_template_part( $attributes ) {
$content = $wp_embed->autoembed( $content );
if ( empty( $attributes['tagName'] ) ) {
- $defined_areas = get_allowed_block_template_part_areas();
- $area_tag = 'div';
- foreach ( $defined_areas as $defined_area ) {
- if ( $defined_area['area'] === $area && isset( $defined_area['area_tag'] ) ) {
- $area_tag = $defined_area['area_tag'];
- }
+ $area_tag = 'div';
+ if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
+ $area_tag = $area_definition['area_tag'];
}
$html_tag = $area_tag;
} else {
diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json
index 3801eee941bc9..282ac2ca22127 100644
--- a/src/wp-includes/blocks/template-part/block.json
+++ b/src/wp-includes/blocks/template-part/block.json
@@ -21,6 +21,7 @@
}
},
"supports": {
+ "anchor": true,
"align": true,
"html": false,
"reusable": false
diff --git a/src/wp-includes/blocks/term-description.php b/src/wp-includes/blocks/term-description.php
index 4f1cd7e518d11..011ec28f2e5e6 100644
--- a/src/wp-includes/blocks/term-description.php
+++ b/src/wp-includes/blocks/term-description.php
@@ -23,10 +23,14 @@ function render_block_core_term_description( $attributes ) {
return '';
}
- $extra_attributes = ( isset( $attributes['textAlign'] ) )
- ? array( 'class' => 'has-text-align-' . $attributes['textAlign'] )
- : array();
- $wrapper_attributes = get_block_wrapper_attributes( $extra_attributes );
+ $classes = array();
+ if ( isset( $attributes['textAlign'] ) ) {
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
+ }
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
return '
, when walking an input document.
+ *
+ * @since 6.2.0
+ * @var bool
+ */
+ private $stop_on_tag_closers;
+
+ /**
+ * The updated HTML document.
+ *
+ * @since 6.2.0
+ * @var string
+ */
+ private $updated_html = '';
+
+ /**
+ * How many bytes from the original HTML document were already read.
+ *
+ * @since 6.2.0
+ * @var int
+ */
+ private $parsed_bytes = 0;
+
+ /**
+ * How many bytes from the original HTML document were already treated
+ * with the requested replacements.
+ *
+ * @since 6.2.0
+ * @var int
+ */
+ private $updated_bytes = 0;
+
+ /**
+ * Byte offset in input document where current tag name starts.
+ *
+ * Example:
+ * ```
+ * %2$s
',
- get_block_wrapper_attributes(),
+ $wrapper_attributes,
$content
);
}
diff --git a/src/wp-includes/blocks/query-no-results/block.json b/src/wp-includes/blocks/query-no-results/block.json
index f042223f36aec..789dcc8e66f60 100644
--- a/src/wp-includes/blocks/query-no-results/block.json
+++ b/src/wp-includes/blocks/query-no-results/block.json
@@ -9,6 +9,7 @@
"textdomain": "default",
"usesContext": [ "queryId", "query" ],
"supports": {
+ "anchor": true,
"align": true,
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json
index ad87d05b5ed99..d4861519f149e 100644
--- a/src/wp-includes/blocks/query-pagination-next/block.json
+++ b/src/wp-includes/blocks/query-pagination-next/block.json
@@ -14,6 +14,7 @@
},
"usesContext": [ "queryId", "query", "paginationArrow" ],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json
index fd28596581961..a05faff5f1b52 100644
--- a/src/wp-includes/blocks/query-pagination-numbers/block.json
+++ b/src/wp-includes/blocks/query-pagination-numbers/block.json
@@ -9,6 +9,7 @@
"textdomain": "default",
"usesContext": [ "queryId", "query" ],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json
index 484cefe6bbd82..823808b0fb054 100644
--- a/src/wp-includes/blocks/query-pagination-previous/block.json
+++ b/src/wp-includes/blocks/query-pagination-previous/block.json
@@ -14,6 +14,7 @@
},
"usesContext": [ "queryId", "query", "paginationArrow" ],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query-pagination.php b/src/wp-includes/blocks/query-pagination.php
index eaa784be08e7d..9b7289ec22e0f 100644
--- a/src/wp-includes/blocks/query-pagination.php
+++ b/src/wp-includes/blocks/query-pagination.php
@@ -18,9 +18,11 @@ function render_block_core_query_pagination( $attributes, $content ) {
return '';
}
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
$wrapper_attributes = get_block_wrapper_attributes(
array(
'aria-label' => __( 'Pagination' ),
+ 'class' => $classes,
)
);
diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json
index f75f4077d4e13..fa980575ec969 100644
--- a/src/wp-includes/blocks/query-pagination/block.json
+++ b/src/wp-includes/blocks/query-pagination/block.json
@@ -18,6 +18,7 @@
"paginationArrow": "paginationArrow"
},
"supports": {
+ "anchor": true,
"align": true,
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 33df75866bce0..029762c321e39 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -27,6 +27,7 @@
}
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
index cd09e22ee57f7..bcff0e3ac63b1 100644
--- a/src/wp-includes/blocks/query/block.json
+++ b/src/wp-includes/blocks/query/block.json
@@ -49,15 +49,8 @@
},
"supports": {
"align": [ "wide", "full" ],
+ "anchor": true,
"html": false,
- "color": {
- "gradients": true,
- "link": true,
- "__experimentalDefaultControls": {
- "background": true,
- "text": true
- }
- },
"__experimentalLayout": true
},
"editorStyle": "wp-block-query-editor"
diff --git a/src/wp-includes/blocks/read-more.php b/src/wp-includes/blocks/read-more.php
index 93013b2517d14..7bfd22e6d4c4d 100644
--- a/src/wp-includes/blocks/read-more.php
+++ b/src/wp-includes/blocks/read-more.php
@@ -19,15 +19,22 @@ function render_block_core_read_more( $attributes, $content, $block ) {
}
$post_ID = $block->context['postId'];
+ $post_title = get_the_title( $post_ID );
+ $screen_reader_text = sprintf(
+ /* translators: %s is either the post title or post ID to describe the link for screen readers. */
+ __( ': %s' ),
+ '' !== $post_title ? $post_title : __( 'untitled post ' ) . $post_ID
+ );
$justify_class_name = empty( $attributes['justifyContent'] ) ? '' : "is-justified-{$attributes['justifyContent']}";
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $justify_class_name ) );
$more_text = ! empty( $attributes['content'] ) ? wp_kses_post( $attributes['content'] ) : __( 'Read more' );
return sprintf(
- '%4s',
+ '%4s%5s',
$wrapper_attributes,
get_the_permalink( $post_ID ),
esc_attr( $attributes['linkTarget'] ),
- $more_text
+ $more_text,
+ $screen_reader_text
);
}
diff --git a/src/wp-includes/blocks/read-more/block.json b/src/wp-includes/blocks/read-more/block.json
index 61b0452c7c80e..ed2b23c3b7f0f 100644
--- a/src/wp-includes/blocks/read-more/block.json
+++ b/src/wp-includes/blocks/read-more/block.json
@@ -17,6 +17,7 @@
},
"usesContext": [ "postId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
index 4841d214c84ce..1f9bf0a16c802 100644
--- a/src/wp-includes/blocks/require-dynamic-blocks.php
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -22,6 +22,7 @@
require_once ABSPATH . WPINC . '/blocks/cover.php';
require_once ABSPATH . WPINC . '/blocks/file.php';
require_once ABSPATH . WPINC . '/blocks/gallery.php';
+require_once ABSPATH . WPINC . '/blocks/heading.php';
require_once ABSPATH . WPINC . '/blocks/home-link.php';
require_once ABSPATH . WPINC . '/blocks/image.php';
require_once ABSPATH . WPINC . '/blocks/latest-comments.php';
@@ -34,6 +35,7 @@
require_once ABSPATH . WPINC . '/blocks/pattern.php';
require_once ABSPATH . WPINC . '/blocks/post-author.php';
require_once ABSPATH . WPINC . '/blocks/post-author-biography.php';
+require_once ABSPATH . WPINC . '/blocks/post-author-name.php';
require_once ABSPATH . WPINC . '/blocks/post-comments-form.php';
require_once ABSPATH . WPINC . '/blocks/post-content.php';
require_once ABSPATH . WPINC . '/blocks/post-date.php';
diff --git a/src/wp-includes/blocks/require-static-blocks.php b/src/wp-includes/blocks/require-static-blocks.php
index 9a1884e9cf09b..44009bef5fff0 100644
--- a/src/wp-includes/blocks/require-static-blocks.php
+++ b/src/wp-includes/blocks/require-static-blocks.php
@@ -12,7 +12,6 @@
'embed',
'freeform',
'group',
- 'heading',
'html',
'list',
'list-item',
@@ -20,6 +19,7 @@
'missing',
'more',
'nextpage',
+ 'page-list-item',
'paragraph',
'preformatted',
'pullquote',
diff --git a/src/wp-includes/blocks/rss.php b/src/wp-includes/blocks/rss.php
index e32155195af1d..91cdab3f589e0 100644
--- a/src/wp-includes/blocks/rss.php
+++ b/src/wp-includes/blocks/rss.php
@@ -48,7 +48,7 @@ function render_block_core_rss( $attributes ) {
if ( $date ) {
$date = sprintf(
' ',
- esc_attr( date_i18n( get_option( 'c' ), $date ) ),
+ esc_attr( date_i18n( 'c', $date ) ),
esc_attr( date_i18n( get_option( 'date_format' ), $date ) )
);
}
diff --git a/src/wp-includes/blocks/rss/block.json b/src/wp-includes/blocks/rss/block.json
index 8a351d877a751..2e3fd4b2d385e 100644
--- a/src/wp-includes/blocks/rss/block.json
+++ b/src/wp-includes/blocks/rss/block.json
@@ -43,6 +43,7 @@
},
"supports": {
"align": true,
+ "anchor": true,
"html": false
},
"editorStyle": "wp-block-rss-editor",
diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php
index 26b6a7585ccc7..c7461a86795b5 100644
--- a/src/wp-includes/blocks/search.php
+++ b/src/wp-includes/blocks/search.php
@@ -66,14 +66,14 @@ function render_block_core_search( $attributes ) {
if ( $show_input ) {
$input_classes = array( 'wp-block-search__input' );
- if ( $is_button_inside ) {
+ if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
$input_classes[] = $border_color_classes;
}
if ( ! empty( $typography_classes ) ) {
$input_classes[] = $typography_classes;
}
$input_markup = sprintf(
- '',
+ '',
$input_id,
esc_attr( implode( ' ', $input_classes ) ),
get_search_query(),
diff --git a/src/wp-includes/blocks/search/block.json b/src/wp-includes/blocks/search/block.json
index fbd0fa874c408..387295ebb36de 100644
--- a/src/wp-includes/blocks/search/block.json
+++ b/src/wp-includes/blocks/search/block.json
@@ -46,6 +46,7 @@
},
"supports": {
"align": [ "left", "center", "right" ],
+ "anchor": true,
"color": {
"gradients": true,
"__experimentalSkipSerialization": true,
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
index f7efcb72159ff..f5eab1de304bc 100644
--- a/src/wp-includes/blocks/site-logo/block.json
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -31,6 +31,7 @@
},
"supports": {
"html": false,
+ "anchor": true,
"align": true,
"alignWide": false,
"color": {
diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json
index 7a69e6b1e22a9..c7da7ebf3fdde 100644
--- a/src/wp-includes/blocks/site-tagline/block.json
+++ b/src/wp-includes/blocks/site-tagline/block.json
@@ -4,7 +4,7 @@
"name": "core/site-tagline",
"title": "Site Tagline",
"category": "theme",
- "description": "Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it's not displayed in the theme design.",
+ "description": "Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it’s not displayed in the theme design.",
"keywords": [ "description" ],
"textdomain": "default",
"attributes": {
@@ -13,6 +13,7 @@
}
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/site-title.php b/src/wp-includes/blocks/site-title.php
index 3c3e4d8669238..255615b3a4e45 100644
--- a/src/wp-includes/blocks/site-title.php
+++ b/src/wp-includes/blocks/site-title.php
@@ -18,8 +18,11 @@ function render_block_core_site_title( $attributes ) {
return;
}
- $tag_name = 'h1';
- $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+ $tag_name = 'h1';
+ $classes = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes .= ' has-link-color';
+ }
if ( isset( $attributes['level'] ) ) {
$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
@@ -37,7 +40,7 @@ function render_block_core_site_title( $attributes ) {
esc_html( $site_title )
);
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classes ) ) );
return sprintf(
'<%1$s %2$s>%3$s',
diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json
index 717db27747d7f..b69acda934fda 100644
--- a/src/wp-includes/blocks/site-title/block.json
+++ b/src/wp-includes/blocks/site-title/block.json
@@ -27,6 +27,7 @@
"viewportWidth": 500
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
@@ -60,5 +61,6 @@
}
}
},
- "editorStyle": "wp-block-site-title-editor"
+ "editorStyle": "wp-block-site-title-editor",
+ "style": "wp-block-site-title"
}
diff --git a/src/wp-includes/blocks/social-link.php b/src/wp-includes/blocks/social-link.php
index 3aabd2a9a8430..7e669bf56d6da 100644
--- a/src/wp-includes/blocks/social-link.php
+++ b/src/wp-includes/blocks/social-link.php
@@ -20,6 +20,7 @@ function render_block_core_social_link( $attributes, $content, $block ) {
$service = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
$url = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
$label = ( isset( $attributes['label'] ) ) ? $attributes['label'] : block_core_social_link_get_name( $service );
+ $rel = ( isset( $attributes['rel'] ) ) ? $attributes['rel'] : '';
$show_labels = array_key_exists( 'showLabels', $block->context ) ? $block->context['showLabels'] : false;
// Don't render a link if there is no URL set.
@@ -43,11 +44,6 @@ function render_block_core_social_link( $attributes, $content, $block ) {
$url = 'https://' . $url;
}
- $rel_target_attributes = '';
- if ( $open_in_new_tab ) {
- $rel_target_attributes = 'rel="noopener nofollow" target="_blank"';
- }
-
$icon = block_core_social_link_get_icon( $service );
$wrapper_attributes = get_block_wrapper_attributes(
array(
@@ -57,13 +53,21 @@ function render_block_core_social_link( $attributes, $content, $block ) {
);
$link = '' . $term_description . '
';
}
diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json
index 66eb9348a4709..5e945b2d0f637 100644
--- a/src/wp-includes/blocks/term-description/block.json
+++ b/src/wp-includes/blocks/term-description/block.json
@@ -12,6 +12,7 @@
}
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
diff --git a/src/wp-includes/class-wp-block-parser.php b/src/wp-includes/class-wp-block-parser.php
index 95add35cbfb6f..50337b588a37b 100644
--- a/src/wp-includes/class-wp-block-parser.php
+++ b/src/wp-includes/class-wp-block-parser.php
@@ -80,7 +80,7 @@ class WP_Block_Parser_Block {
* @param string $innerHTML Resultant HTML from inside block comment delimiters after removing inner blocks.
* @param array $innerContent List of string fragments and null markers where inner blocks were found.
*/
- function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
+ public function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
$this->blockName = $name;
$this->attrs = $attrs;
$this->innerBlocks = $innerBlocks;
@@ -152,7 +152,7 @@ class WP_Block_Parser_Frame {
* @param int $prev_offset Byte offset into document for after parse token ends.
* @param int $leading_html_start Byte offset into document where leading HTML before token starts.
*/
- function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
+ public function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
$this->block = $block;
$this->token_start = $token_start;
$this->token_length = $token_length;
@@ -224,16 +224,16 @@ class WP_Block_Parser {
* @param string $document Input document being parsed.
* @return array[]
*/
- function parse( $document ) {
+ public function parse( $document ) {
$this->document = $document;
$this->offset = 0;
$this->output = array();
$this->stack = array();
$this->empty_attrs = json_decode( '{}', true );
- do {
- // twiddle our thumbs.
- } while ( $this->proceed() );
+ while ( $this->proceed() ) {
+ continue;
+ }
return $this->output;
}
@@ -252,7 +252,7 @@ function parse( $document ) {
* @since 5.0.0
* @return bool
*/
- function proceed() {
+ public function proceed() {
$next_token = $this->next_token();
list( $token_type, $block_name, $attrs, $start_offset, $token_length ) = $next_token;
$stack_depth = count( $this->stack );
@@ -398,7 +398,7 @@ function proceed() {
* @since 4.6.1 fixed a bug in attribute parsing which caused catastrophic backtracking on invalid block comments
* @return array
*/
- function next_token() {
+ public function next_token() {
$matches = null;
/*
@@ -473,7 +473,7 @@ function next_token() {
* @param string $innerHTML HTML content of block.
* @return WP_Block_Parser_Block freeform block object.
*/
- function freeform( $innerHTML ) {
+ public function freeform( $innerHTML ) {
return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $innerHTML, array( $innerHTML ) );
}
@@ -485,7 +485,7 @@ function freeform( $innerHTML ) {
* @since 5.0.0
* @param null $length how many bytes of document text to output.
*/
- function add_freeform( $length = null ) {
+ public function add_freeform( $length = null ) {
$length = $length ? $length : strlen( $this->document ) - $this->offset;
if ( 0 === $length ) {
@@ -506,7 +506,7 @@ function add_freeform( $length = null ) {
* @param int $token_length Byte length of entire block from start of opening token to end of closing token.
* @param int|null $last_offset Last byte offset into document if continuing form earlier output.
*/
- function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
+ public function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
$parent = $this->stack[ count( $this->stack ) - 1 ];
$parent->block->innerBlocks[] = (array) $block;
$html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
@@ -527,7 +527,7 @@ function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_len
* @since 5.0.0
* @param int|null $end_offset byte offset into document for where we should stop sending text output as HTML.
*/
- function add_block_from_stack( $end_offset = null ) {
+ public function add_block_from_stack( $end_offset = null ) {
$stack_top = array_pop( $this->stack );
$prev_offset = $stack_top->prev_offset;
diff --git a/src/wp-includes/html-api/class-wp-html-attribute-token.php b/src/wp-includes/html-api/class-wp-html-attribute-token.php
new file mode 100644
index 0000000000000..2c52164a979f0
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-attribute-token.php
@@ -0,0 +1,89 @@
+name = $name;
+ $this->value_starts_at = $value_start;
+ $this->value_length = $value_length;
+ $this->start = $start;
+ $this->end = $end;
+ $this->is_true = $is_true;
+ }
+}
diff --git a/src/wp-includes/html-api/class-wp-html-span.php b/src/wp-includes/html-api/class-wp-html-span.php
new file mode 100644
index 0000000000000..d92778cd3a222
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-span.php
@@ -0,0 +1,52 @@
+start = $start;
+ $this->end = $end;
+ }
+}
diff --git a/src/wp-includes/html-api/class-wp-html-tag-processor.php b/src/wp-includes/html-api/class-wp-html-tag-processor.php
new file mode 100644
index 0000000000000..ac004b524ca5d
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-tag-processor.php
@@ -0,0 +1,2170 @@
+ "c" not " c"
+ * @TODO: Skip over `/` in attributes area, split attribute names by `/`
+ * @TODO: Decode HTML references/entities in class names when matching.
+ * E.g. match having class `1<"2` needs to recognize `class="1<"2"`.
+ * @TODO: Decode character references in `get_attribute()`
+ * @TODO: Properly escape attribute value in `set_attribute()`
+ * @TODO: Add slow mode to escape character entities in CSS class names?
+ * (This requires a custom decoder since `html_entity_decode()`
+ * doesn't handle attribute character reference decoding rules.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Processes an input HTML document by applying a specified set
+ * of patches to that input. Tokenizes HTML but does not fully
+ * parse the input document.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ * 1. Create a new class instance with your input HTML document.
+ * 2. Find the tag(s) you are looking for.
+ * 3. Request changes to the attributes in those tag(s).
+ *
+ * Example:
+ * ```php
+ * $tags = new WP_HTML_Tag_Processor( $html );
+ * if ( $tags->next_tag( [ 'tag_name' => 'option' ] ) ) {
+ * $tags->set_attribute( 'selected', true );
+ * }
+ * ```
+ *
+ * ### Finding tags
+ *
+ * The `next_tag()` function moves the internal cursor through
+ * your input HTML document until it finds a tag meeting any of
+ * the supplied restrictions in the optional query argument. If
+ * no argument is provided then it will find the next HTML tag,
+ * regardless of what kind it is.
+ *
+ * If you want to _find whatever the next tag is_:
+ * ```php
+ * $tags->next_tag();
+ * ```
+ *
+ * | Goal | Query |
+ * |-----------------------------------------------------------|----------------------------------------------------------------------------|
+ * | Find any tag. | `$tags->next_tag();` |
+ * | Find next image tag. | `$tags->next_tag( [ 'tag_name' => 'img' ] );` |
+ * | Find next tag containing the `fullwidth` CSS class. | `$tags->next_tag( [ 'class_name' => 'fullwidth' ] );` |
+ * | Find next image tag containing the `fullwidth` CSS class. | `$tags->next_tag( [ 'tag_name' => 'img', 'class_name' => 'fullwidth' ] );` |
+ *
+ * If a tag was found meeting your criteria then `next_tag()`
+ * will return `true` and you can proceed to modify it. If it
+ * returns `false`, however, it failed to find the tag and
+ * moved the cursor to the end of the file.
+ *
+ * Once the cursor reaches the end of the file the processor
+ * is done and if you want to reach an earlier tag you will
+ * need to recreate the processor and start over, as it's
+ * unable to back up or move in reverse.
+ *
+ * See the section on bookmarks for an exception to this
+ * no-backing-up rule.
+ *
+ * #### Custom queries
+ *
+ * Sometimes it's necessary to further inspect an HTML tag than
+ * the query syntax here permits. In these cases one may further
+ * inspect the search results using the read-only functions
+ * provided by the processor or external state or variables.
+ *
+ * Example:
+ * ```php
+ * // Paint up to the first five DIV or SPAN tags marked with the "jazzy" style.
+ * $remaining_count = 5;
+ * while ( $remaining_count > 0 && $tags->next_tag() ) {
+ * if (
+ * ( 'DIV' === $tags->get_tag() || 'SPAN' === $tags->get_tag() ) &&
+ * 'jazzy' === $tags->get_attribute( 'data-style' )
+ * ) {
+ * $tags->add_class( 'theme-style-everest-jazz' );
+ * $remaining_count--;
+ * }
+ * }
+ * ```
+ *
+ * `get_attribute()` will return `null` if the attribute wasn't present
+ * on the tag when it was called. It may return `""` (the empty string)
+ * in cases where the attribute was present but its value was empty.
+ * For boolean attributes, those whose name is present but no value is
+ * given, it will return `true` (the only way to set `false` for an
+ * attribute is to remove it).
+ *
+ * ### Modifying HTML attributes for a found tag
+ *
+ * Once you've found the start of an opening tag you can modify
+ * any number of the attributes on that tag. You can set a new
+ * value for an attribute, remove the entire attribute, or do
+ * nothing and move on to the next opening tag.
+ *
+ * Example:
+ * ```php
+ * if ( $tags->next_tag( [ 'class' => 'wp-group-block' ] ) ) {
+ * $tags->set_attribute( 'title', 'This groups the contained content.' );
+ * $tags->remove_attribute( 'data-test-id' );
+ * }
+ * ```
+ *
+ * If `set_attribute()` is called for an existing attribute it will
+ * overwrite the existing value. Similarly, calling `remove_attribute()`
+ * for a non-existing attribute has no effect on the document. Both
+ * of these methods are safe to call without knowing if a given attribute
+ * exists beforehand.
+ *
+ * ### Modifying CSS classes for a found tag
+ *
+ * The tag processor treats the `class` attribute as a special case.
+ * Because it's a common operation to add or remove CSS classes, this
+ * interface adds helper methods to make that easier.
+ *
+ * As with attribute values, adding or removing CSS classes is a safe
+ * operation that doesn't require checking if the attribute or class
+ * exists before making changes. If removing the only class then the
+ * entire `class` attribute will be removed.
+ *
+ * Example:
+ * ```php
+ * // from `Yippee!`
+ * // to `Yippee!`
+ * $tags->add_class( 'is-active' );
+ *
+ * // from `Yippee!`
+ * // to `Yippee!`
+ * $tags->add_class( 'is-active' );
+ *
+ * // from `Yippee!`
+ * // to `Yippee!`
+ * $tags->add_class( 'is-active' );
+ *
+ * // from ``
+ * // to `
+ * $tags->remove_class( 'rugby' );
+ *
+ * // from ``
+ * // to `
+ * $tags->remove_class( 'rugby' );
+ *
+ * // from ``
+ * // to `
+ * $tags->remove_class( 'rugby' );
+ * ```
+ *
+ * When class changes are enqueued but a direct change to `class` is made via
+ * `set_attribute` then the changes to `set_attribute` (or `remove_attribute`)
+ * will take precedence over those made through `add_class` and `remove_class`.
+ *
+ * ### Bookmarks
+ *
+ * While scanning through the input HTMl document it's possible to set
+ * a named bookmark when a particular tag is found. Later on, after
+ * continuing to scan other tags, it's possible to `seek` to one of
+ * the set bookmarks and then proceed again from that point forward.
+ *
+ * Because bookmarks create processing overhead one should avoid
+ * creating too many of them. As a rule, create only bookmarks
+ * of known string literal names; avoid creating "mark_{$index}"
+ * and so on. It's fine from a performance standpoint to create a
+ * bookmark and update it frequently, such as within a loop.
+ *
+ * ```php
+ * $total_todos = 0;
+ * while ( $p->next_tag( [ 'tag_name' => 'UL', 'class_name' => 'todo' ] ) ) {
+ * $p->set_bookmark( 'list-start' );
+ * while ( $p->next_tag( [ 'tag_closers' => 'visit' ] ) ) {
+ * if ( 'UL' === $p->get_tag() && $p->is_tag_closer() ) {
+ * $p->set_bookmark( 'list-end' );
+ * $p->seek( 'list-start' );
+ * $p->set_attribute( 'data-contained-todos', (string) $total_todos );
+ * $total_todos = 0;
+ * $p->seek( 'list-end' );
+ * break;
+ * }
+ *
+ * if ( 'LI' === $p->get_tag() && ! $p->is_tag_closer() ) {
+ * $total_todos++;
+ * }
+ * }
+ * }
+ * ```
+ *
+ * ## Design limitations
+ *
+ * @TODO: Expand this section
+ *
+ * - No nesting: cannot match open and close tag.
+ * - Class names are not decoded if they contain character references.
+ *
+ * @since 6.2.0
+ */
+class WP_HTML_Tag_Processor {
+ /**
+ * The maximum number of bookmarks allowed to exist at
+ * any given time.
+ *
+ * @see set_bookmark()
+ * @since 6.2.0
+ * @var int
+ */
+ const MAX_BOOKMARKS = 10;
+
+ /**
+ * Maximum number of times seek() can be called.
+ * Prevents accidental infinite loops.
+ *
+ * @see seek()
+ * @since 6.2.0
+ * @var int
+ */
+ const MAX_SEEK_OPS = 1000;
+
+ /**
+ * The HTML document to parse.
+ *
+ * @since 6.2.0
+ * @var string
+ */
+ private $html;
+
+ /**
+ * The last query passed to next_tag().
+ *
+ * @since 6.2.0
+ * @var array|null
+ */
+ private $last_query;
+
+ /**
+ * The tag name this processor currently scans for.
+ *
+ * @since 6.2.0
+ * @var string|null
+ */
+ private $sought_tag_name;
+
+ /**
+ * The CSS class name this processor currently scans for.
+ *
+ * @since 6.2.0
+ * @var string|null
+ */
+ private $sought_class_name;
+
+ /**
+ * The match offset this processor currently scans for.
+ *
+ * @since 6.2.0
+ * @var int|null
+ */
+ private $sought_match_offset;
+
+ /**
+ * Whether to visit tag closers, e.g. ...
+ * 01234
+ * - tag name starts at 1
+ * ```
+ *
+ * @since 6.2.0
+ * @var int|null
+ */
+ private $tag_name_starts_at;
+
+ /**
+ * Byte length of current tag name.
+ *
+ * Example:
+ * ```
+ * <span class="d-none d-md-inline">Back to notifications</title</span> ',
+ 'rcdata_tag' => 'TITLE',
+ ),
+ 'comment opener inside a textarea tag should be ignored' => array(
+ 'rcdata_then_div' => '-->',
+ 'rcdata_tag' => 'TEXTAREA',
+ ),
+ 'textarea closer with another textarea tag in closer attributes' => array(
+ 'rcdata_then_div' => '',
+ 'rcdata_tag' => 'TEXTAREA',
+ ),
+ 'textarea closer with attributes' => array(
+ 'rcdata_then_div' => '',
+ 'rcdata_tag' => 'TEXTAREA',
+ ),
+ 'textarea opener with title closer inside' => array(
+ 'rcdata_then_div' => '',
+ 'rcdata_tag' => 'TEXTAREA',
+ ),
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::next_tag
+ *
+ * @dataProvider data_skips_contents_of_script_and_rcdata_regions
+ *
+ * @param $input_html HTML with multiple divs, one of which carries the "target" attribute.
+ */
+ public function test_skips_contents_of_script_and_rcdata_regions( $input_html ) {
+ $p = new WP_HTML_Tag_Processor( $input_html );
+ $p->next_tag( 'div' );
+
+ $this->assertTrue( $p->get_attribute( 'target' ) );
+ }
+
+ /**
+ * Data provider
+ *
+ * @return array[]
+ */
+ public function data_skips_contents_of_script_and_rcdata_regions() {
+ return array(
+ 'Balanced SCRIPT tags' => array( '
...
+ * 01234
+ * --- tag name length is 3
+ * ```
+ *
+ * @since 6.2.0
+ * @var int|null
+ */
+ private $tag_name_length;
+
+ /**
+ * Byte offset in input document where current tag token ends.
+ *
+ * Example:
+ * ```
+ *
+HTML;
+
+ $p = new WP_HTML_Tag_Processor( $input );
+ $this->assertTrue( $p->next_tag( 'div' ), 'Querying an existing tag did not return true' );
+ $p->set_attribute( 'data-details', '{ "key": "value" }' );
+ $p->add_class( 'is-processed' );
+ $this->assertTrue(
+ $p->next_tag(
+ array(
+ 'tag_name' => 'div',
+ 'class_name' => 'BtnGroup',
+ )
+ ),
+ 'Querying an existing tag did not return true'
+ );
+ $p->remove_class( 'BtnGroup' );
+ $p->add_class( 'button-group' );
+ $p->add_class( 'Another-Mixed-Case' );
+ $this->assertTrue(
+ $p->next_tag(
+ array(
+ 'tag_name' => 'div',
+ 'class_name' => 'BtnGroup',
+ )
+ ),
+ 'Querying an existing tag did not return true'
+ );
+ $p->remove_class( 'BtnGroup' );
+ $p->add_class( 'button-group' );
+ $p->add_class( 'Another-Mixed-Case' );
+ $this->assertTrue(
+ $p->next_tag(
+ array(
+ 'tag_name' => 'button',
+ 'class_name' => 'btn',
+ 'match_offset' => 3,
+ )
+ ),
+ 'Querying an existing tag did not return true'
+ );
+ $p->remove_attribute( 'class' );
+ $this->assertFalse( $p->next_tag( 'non-existent' ), 'Querying a non-existing tag did not return false' );
+ $p->set_attribute( 'class', 'test' );
+ $this->assertSame( $expected_output, $p->get_updated_html(), 'Calling get_updated_html after updating the attributes did not return the expected HTML' );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_correctly_parses_html_attributes_wrapped_in_single_quotation_marks() {
+ $p = new WP_HTML_Tag_Processor(
+ '...
+ * 0 1 |
+ * 01234567890123456
+ * --- tag name ends at 14
+ * ```
+ *
+ * @since 6.2.0
+ * @var int|null
+ */
+ private $tag_ends_at;
+
+ /**
+ * Whether the current tag is an opening tag, e.g. Surprising fact you may no…
+ * ^ ^
+ * \-|-- it shifts with edits
+ * ```
+ *
+ * Bookmarks provide the ability to seek to a previously-scanned
+ * place in the HTML document. This avoids the need to re-scan
+ * the entire document.
+ *
+ * Example:
+ * ```
+ *
+HTML;
+
+ $expected_output = <<
+
+, or a closing tag, e.g.
.
+ *
+ * @var bool
+ */
+ private $is_closing_tag;
+
+ /**
+ * Lazily-built index of attributes found within an HTML tag, keyed by the attribute name.
+ *
+ * Example:
+ * ```php
+ * // supposing the parser is working through this content
+ * // and stops after recognizing the `id` attribute
+ * //
+ * // ^ parsing will continue from this point
+ * $this->attributes = [
+ * 'id' => new WP_HTML_Attribute_Match( 'id', null, 6, 17 )
+ * ];
+ *
+ * // when picking up parsing again, or when asking to find the
+ * // `class` attribute we will continue and add to this array
+ * $this->attributes = [
+ * 'id' => new WP_HTML_Attribute_Match( 'id', null, 6, 17 ),
+ * 'class' => new WP_HTML_Attribute_Match( 'class', 'outline', 18, 32 )
+ * ];
+ *
+ * // Note that only the `class` attribute value is stored in the index.
+ * // That's because it is the only value used by this class at the moment.
+ * ```
+ *
+ * @since 6.2.0
+ * @var WP_HTML_Attribute_Token[]
+ */
+ private $attributes = array();
+
+ /**
+ * Which class names to add or remove from a tag.
+ *
+ * These are tracked separately from attribute updates because they are
+ * semantically distinct, whereas this interface exists for the common
+ * case of adding and removing class names while other attributes are
+ * generally modified as with DOM `setAttribute` calls.
+ *
+ * When modifying an HTML document these will eventually be collapsed
+ * into a single `set_attribute( 'class', $changes )` call.
+ *
+ * Example:
+ * ```php
+ * // Add the `wp-block-group` class, remove the `wp-group` class.
+ * $classname_updates = [
+ * // Indexed by a comparable class name
+ * 'wp-block-group' => WP_HTML_Tag_Processor::ADD_CLASS,
+ * 'wp-group' => WP_HTML_Tag_Processor::REMOVE_CLASS
+ * ];
+ * ```
+ *
+ * @since 6.2.0
+ * @var bool[]
+ */
+ private $classname_updates = array();
+
+ /**
+ * Tracks a semantic location in the original HTML which
+ * shifts with updates as they are applied to the document.
+ *
+ * @since 6.2.0
+ * @var WP_HTML_Span[]
+ */
+ private $bookmarks = array();
+
+ const ADD_CLASS = true;
+ const REMOVE_CLASS = false;
+ const SKIP_CLASS = null;
+
+ /**
+ * Lexical replacements to apply to input HTML document.
+ *
+ * "Lexical" in this class refers to the part of this class which
+ * operates on pure text _as text_ and not as HTML. There's a line
+ * between the public interface, with HTML-semantic methods like
+ * `set_attribute` and `add_class`, and an internal state that tracks
+ * text offsets in the input document.
+ *
+ * When higher-level HTML methods are called, those have to transform their
+ * operations (such as setting an attribute's value) into text diffing
+ * operations (such as replacing the sub-string from indices A to B with
+ * some given new string). These text-diffing operations are the lexical
+ * updates.
+ *
+ * As new higher-level methods are added they need to collapse their
+ * operations into these lower-level lexical updates since that's the
+ * Tag Processor's internal language of change. Any code which creates
+ * these lexical updates must ensure that they do not cross HTML syntax
+ * boundaries, however, so these should never be exposed outside of this
+ * class or any classes which intentionally expand its functionality.
+ *
+ * These are enqueued while editing the document instead of being immediately
+ * applied to avoid processing overhead, string allocations, and string
+ * copies when applying many updates to a single document.
+ *
+ * Example:
+ * ```php
+ * // Replace an attribute stored with a new value, indices
+ * // sourced from the lazily-parsed HTML recognizer.
+ * $start = $attributes['src']->start;
+ * $end = $attributes['src']->end;
+ * $modifications[] = new WP_HTML_Text_Replacement( $start, $end, $new_value );
+ *
+ * // Correspondingly, something like this will appear in this array.
+ * $lexical_updates = [
+ * WP_HTML_Text_Replacement( 14, 28, 'https://my-site.my-domain/wp-content/uploads/2014/08/kittens.jpg' )
+ * ];
+ * ```
+ *
+ * @since 6.2.0
+ * @var WP_HTML_Text_Replacement[]
+ */
+ private $lexical_updates = array();
+
+ /**
+ * Tracks and limits `seek()` calls to prevent accidental infinite loops.
+ *
+ * @see seek
+ * @since 6.2.0
+ * @var int
+ */
+ private $seek_count = 0;
+
+ /**
+ * Constructor.
+ *
+ * @since 6.2.0
+ *
+ * @param string $html HTML to process.
+ */
+ public function __construct( $html ) {
+ $this->html = $html;
+ }
+
+ /**
+ * Finds the next tag matching the $query.
+ *
+ * @since 6.2.0
+ *
+ * @param array|string|null $query {
+ * Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+ *
+ * @type string|null $tag_name Which tag to find, or `null` for "any tag."
+ * @type int|null $match_offset Find the Nth tag matching all search criteria.
+ * 0 for "first" tag, 2 for "third," etc.
+ * Defaults to first tag.
+ * @type string|null $class_name Tag must contain this whole class name to match.
+ * @type string|null $tag_closers "visit" or "skip": whether to stop on tag closers, e.g.
.
+ * }
+ * @return boolean Whether a tag was matched.
+ */
+ public function next_tag( $query = null ) {
+ $this->parse_query( $query );
+ $already_found = 0;
+
+ do {
+ if ( $this->parsed_bytes >= strlen( $this->html ) ) {
+ return false;
+ }
+
+ // Find the next tag if it exists.
+ if ( false === $this->parse_next_tag() ) {
+ $this->parsed_bytes = strlen( $this->html );
+
+ return false;
+ }
+
+ // Parse all of its attributes.
+ while ( $this->parse_next_attribute() ) {
+ continue;
+ }
+
+ // Ensure that the tag closes before the end of the document.
+ $tag_ends_at = strpos( $this->html, '>', $this->parsed_bytes );
+ if ( false === $tag_ends_at ) {
+ return false;
+ }
+ $this->tag_ends_at = $tag_ends_at;
+ $this->parsed_bytes = $tag_ends_at;
+
+ // Finally, check if the parsed tag and its attributes match the search query.
+ if ( $this->matches() ) {
+ ++$already_found;
+ }
+
+ /*
+ * For non-DATA sections which might contain text that looks like HTML tags but
+ * isn't, scan with the appropriate alternative mode. Looking at the first letter
+ * of the tag name as a pre-check avoids a string allocation when it's not needed.
+ *
+ * @TODO: Add unit test case and fix (if necessary) for RCDATA tag closer coming before RCDATA tag opener.
+ */
+ $t = $this->html[ $this->tag_name_starts_at ];
+ if ( ! $this->is_closing_tag && ( 's' === $t || 'S' === $t || 't' === $t || 'T' === $t ) ) {
+ $tag_name = $this->get_tag();
+
+ if ( 'SCRIPT' === $tag_name && ! $this->skip_script_data() ) {
+ $this->parsed_bytes = strlen( $this->html );
+ return false;
+ } elseif (
+ ( 'TEXTAREA' === $tag_name || 'TITLE' === $tag_name ) &&
+ ! $this->skip_rcdata( $tag_name )
+ ) {
+ $this->parsed_bytes = strlen( $this->html );
+ return false;
+ }
+ }
+ } while ( $already_found < $this->sought_match_offset );
+
+ return true;
+ }
+
+
+ /**
+ * Sets a bookmark in the HTML document.
+ *
+ * Bookmarks represent specific places or tokens in the HTML
+ * document, such as a tag opener or closer. When applying
+ * edits to a document, such as setting an attribute, the
+ * text offsets of that token may shift; the bookmark is
+ * kept updated with those shifts and remains stable unless
+ * the entire span of text in which the token sits is removed.
+ *
+ * Release bookmarks when they are no longer needed.
+ *
+ * Example:
+ * ```
+ * Surprising fact you may no…
+ * ^ ^
+ * \-|-- it shifts with edits
+ * ```
+ *
+ * Bookmarks provide the ability to seek to a previously-scanned
+ * place in the HTML document. This avoids the need to re-scan
+ * the entire document.
+ *
+ * Example:
+ * ```
+ * - One
- Two
- Three
+ * ^^^^
+ * want to note this last item
+ *
+ * $p = new WP_HTML_Tag_Processor( $html );
+ * $in_list = false;
+ * while ( $p->next_tag( [ 'tag_closers' => $in_list ? 'visit' : 'skip' ] ) ) {
+ * if ( 'UL' === $p->get_tag() ) {
+ * if ( $p->is_tag_closer() ) {
+ * $in_list = false;
+ * $p->set_bookmark( 'resume' );
+ * if ( $p->seek( 'last-li' ) ) {
+ * $p->add_class( 'last-li' );
+ * }
+ * $p->seek( 'resume' );
+ * $p->release_bookmark( 'last-li' );
+ * $p->release_bookmark( 'resume' );
+ * } else {
+ * $in_list = true;
+ * }
+ * }
+ *
+ * if ( 'LI' === $p->get_tag() ) {
+ * $p->set_bookmark( 'last-li' );
+ * }
+ * }
+ * ```
+ *
+ * Bookmarks intentionally hide the internal string offsets
+ * to which they refer. They are maintained internally as
+ * updates are applied to the HTML document and therefore
+ * retain their "position" - the location to which they
+ * originally pointed. The inability to use bookmarks with
+ * functions like `substr` is therefore intentional to guard
+ * against accidentally breaking the HTML.
+ *
+ * Because bookmarks allocate memory and require processing
+ * for every applied update, they are limited and require
+ * a name. They should not be created with programmatically-made
+ * names, such as "li_{$index}" with some loop. As a general
+ * rule they should only be created with string-literal names
+ * like "start-of-section" or "last-paragraph".
+ *
+ * Bookmarks are a powerful tool to enable complicated behavior.
+ * Consider double-checking that you need this tool if you are
+ * reaching for it, as inappropriate use could lead to broken
+ * HTML structure or unwanted processing overhead.
+ *
+ * @since 6.2.0
+ *
+ * @param string $name Identifies this particular bookmark.
+ * @return bool
+ */
+ public function set_bookmark( $name ) {
+ if ( null === $this->tag_name_starts_at ) {
+ return false;
+ }
+
+ if ( ! array_key_exists( $name, $this->bookmarks ) && count( $this->bookmarks ) >= self::MAX_BOOKMARKS ) {
+ if ( WP_DEBUG ) {
+ trigger_error( "Too many bookmarks: cannot create '{$name}'", E_USER_WARNING );
+ }
+ return false;
+ }
+
+ $this->bookmarks[ $name ] = new WP_HTML_Span(
+ $this->tag_name_starts_at - 1,
+ $this->tag_ends_at
+ );
+
+ return true;
+ }
+
+
+ /**
+ * Removes a bookmark that is no longer needed.
+ *
+ * Releasing a bookmark frees up the small
+ * performance overhead it requires.
+ *
+ * @param string $name Name of the bookmark to remove.
+ * @return bool
+ */
+ public function release_bookmark( $name ) {
+ if ( ! array_key_exists( $name, $this->bookmarks ) ) {
+ return false;
+ }
+
+ unset( $this->bookmarks[ $name ] );
+
+ return true;
+ }
+
+
+ /**
+ * Skips the contents of the title and textarea tags until an appropriate
+ * tag closer is found.
+ *
+ * @see https://html.spec.whatwg.org/multipage/parsing.html#rcdata-state
+ * @since 6.2.0
+ *
+ * @param string $tag_name – the lowercase tag name which will close the RCDATA region.
+ * @return bool Whether an end to the RCDATA region was found before the end of the document.
+ */
+ private function skip_rcdata( $tag_name ) {
+ $html = $this->html;
+ $doc_length = strlen( $html );
+ $tag_length = strlen( $tag_name );
+
+ $at = $this->parsed_bytes;
+
+ while ( false !== $at && $at < $doc_length ) {
+ $at = strpos( $this->html, '= $doc_length ) {
+ $this->parsed_bytes = $doc_length;
+ return false;
+ }
+
+ $at += 2;
+
+ /*
+ * Find a case-insensitive match to the tag name.
+ *
+ * Because tag names are limited to US-ASCII there is no
+ * need to perform any kind of Unicode normalization when
+ * comparing; any character which could be impacted by such
+ * normalization could not be part of a tag name.
+ */
+ for ( $i = 0; $i < $tag_length; $i++ ) {
+ $tag_char = $tag_name[ $i ];
+ $html_char = $html[ $at + $i ];
+
+ if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
+ $at += $i;
+ continue 2;
+ }
+ }
+
+ $at += $tag_length;
+ $this->parsed_bytes = $at;
+
+ /*
+ * Ensure that the tag name terminates to avoid matching on
+ * substrings of a longer tag name. For example, the sequence
+ * "' !== $c ) {
+ continue;
+ }
+
+ while ( $this->parse_next_attribute() ) {
+ continue;
+ }
+ $at = $this->parsed_bytes;
+ if ( $at >= strlen( $this->html ) ) {
+ return false;
+ }
+
+ if ( '>' === $html[ $at ] || '/' === $html[ $at ] ) {
+ ++$this->parsed_bytes;
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Skips the contents of ' ),
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_set_attribute_with_a_non_existing_attribute_adds_a_new_attribute_to_the_markup() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'test-attribute', 'test-value' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not include attribute added via set_attribute()'
+ );
+ $this->assertSame(
+ 'test-value',
+ $p->get_attribute( 'test-attribute' ),
+ 'get_attribute() (called after get_updated_html()) did not return attribute added via set_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_get_attribute_returns_updated_values_before_they_are_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'test-attribute', 'test-value' );
+
+ $this->assertSame(
+ 'test-value',
+ $p->get_attribute( 'test-attribute' ),
+ 'get_attribute() (called before get_updated_html()) did not return attribute added via set_attribute()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not include attribute added via set_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_get_attribute_returns_updated_values_before_they_are_updated_with_different_name_casing() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'test-ATTribute', 'test-value' );
+
+ $this->assertSame(
+ 'test-value',
+ $p->get_attribute( 'test-attribute' ),
+ 'get_attribute() (called before get_updated_html()) did not return attribute added via set_attribute()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not include attribute added via set_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_get_attribute_reflects_added_class_names_before_they_are_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->add_class( 'my-class' );
+
+ $this->assertSame(
+ 'my-class',
+ $p->get_attribute( 'class' ),
+ 'get_attribute() (called before get_updated_html()) did not return class name added via add_class()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not include class name added via add_class()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_get_attribute_reflects_added_class_names_before_they_are_updated_and_retains_classes_from_previous_add_class_calls() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->add_class( 'my-class' );
+
+ $this->assertSame(
+ 'my-class',
+ $p->get_attribute( 'class' ),
+ 'get_attribute() (called before get_updated_html()) did not return class name added via add_class()'
+ );
+
+ $p->add_class( 'my-other-class' );
+
+ $this->assertSame(
+ 'my-class my-other-class',
+ $p->get_attribute( 'class' ),
+ 'get_attribute() (called before get_updated_html()) did not return class names added via subsequent add_class() calls'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not include class names added via subsequent add_class() calls'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_get_attribute_reflects_removed_attribute_before_it_is_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->remove_attribute( 'id' );
+
+ $this->assertNull(
+ $p->get_attribute( 'id' ),
+ 'get_attribute() (called before get_updated_html()) returned attribute that was removed by remove_attribute()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML includes attribute that was removed by remove_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_get_attribute_reflects_adding_and_then_removing_an_attribute_before_it_is_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'test-attribute', 'test-value' );
+ $p->remove_attribute( 'test-attribute' );
+
+ $this->assertNull(
+ $p->get_attribute( 'test-attribute' ),
+ 'get_attribute() (called before get_updated_html()) returned attribute that was added via set_attribute() and then removed by remove_attribute()'
+ );
+ $this->assertSame(
+ self::HTML_SIMPLE,
+ $p->get_updated_html(),
+ 'Updated HTML includes attribute that was added via set_attribute() and then removed by remove_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_get_attribute_reflects_setting_and_then_removing_an_existing_attribute_before_it_is_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'id', 'test-value' );
+ $p->remove_attribute( 'id' );
+
+ $this->assertNull(
+ $p->get_attribute( 'id' ),
+ 'get_attribute() (called before get_updated_html()) returned attribute that was overwritten by set_attribute() and then removed by remove_attribute()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML includes attribute that was overwritten by set_attribute() and then removed by remove_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_get_attribute_reflects_removed_class_names_before_they_are_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->remove_class( 'with-border' );
+
+ $this->assertSame(
+ 'main',
+ $p->get_attribute( 'class' ),
+ 'get_attribute() (called before get_updated_html()) returned the wrong attribute after calling remove_attribute()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML includes wrong attribute after calling remove_attribute()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_get_attribute_reflects_setting_and_then_removing_a_class_name_before_it_is_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'foo-class' );
+ $p->remove_class( 'foo-class' );
+
+ $this->assertSame(
+ 'main with-border',
+ $p->get_attribute( 'class' ),
+ 'get_attribute() (called before get_updated_html()) returned class name that was added via add_class() and then removed by remove_class()'
+ );
+ $this->assertSame(
+ self::HTML_WITH_CLASSES,
+ $p->get_updated_html(),
+ 'Updated HTML includes class that was added via add_class() and then removed by remove_class()'
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_get_attribute_reflects_duplicating_and_then_removing_an_existing_class_name_before_it_is_updated() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'with-border' );
+ $p->remove_class( 'with-border' );
+
+ $this->assertSame(
+ 'main',
+ $p->get_attribute( 'class' ),
+ 'get_attribute() (called before get_updated_html()) returned class name that was duplicated via add_class() and then removed by remove_class()'
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML includes class that was duplicated via add_class() and then removed by remove_class()'
+ );
+ }
+
+ /**
+ * According to HTML spec, only the first instance of an attribute counts.
+ * The other ones are ignored.
+ *
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_update_first_when_duplicated_attribute() {
+ $p = new WP_HTML_Tag_Processor( 'Text' );
+ $p->next_tag();
+ $p->set_attribute( 'id', 'updated-id' );
+
+ $this->assertSame( 'Text', $p->get_updated_html() );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_set_attribute_with_an_existing_attribute_name_updates_its_value_in_the_markup() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'id', 'new-id' );
+ $this->assertSame( 'Text', $p->get_updated_html() );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_next_tag_and_set_attribute_in_a_loop_update_all_tags_in_the_markup() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ while ( $p->next_tag() ) {
+ $p->set_attribute( 'data-foo', 'bar' );
+ }
+
+ $this->assertSame( 'Text', $p->get_updated_html() );
+ }
+
+ /**
+ * Removing an attribute that's listed many times, e.g. `` should remove
+ * all its instances and output just ``.
+ *
+ * Today, however, WP_HTML_Tag_Processor only removes the first such attribute. It seems like a corner case
+ * and introducing additional complexity to correctly handle this scenario doesn't seem to be worth it.
+ * Let's revisit if and when this becomes a problem.
+ *
+ * This test is in place to confirm this behavior, while incorrect, is well-defined.
+ *
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_remove_first_when_duplicated_attribute() {
+ $p = new WP_HTML_Tag_Processor( 'Text' );
+ $p->next_tag();
+ $p->remove_attribute( 'id' );
+
+ $this->assertSame( 'Text', $p->get_updated_html() );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_remove_attribute_with_an_existing_attribute_name_removes_it_from_the_markup() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->remove_attribute( 'id' );
+
+ $this->assertSame( 'Text', $p->get_updated_html() );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_remove_attribute_with_a_non_existing_attribute_name_does_not_change_the_markup() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->remove_attribute( 'no-such-attribute' );
+
+ $this->assertSame( self::HTML_SIMPLE, $p->get_updated_html() );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_add_class_creates_a_class_attribute_when_there_is_none() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->add_class( 'foo-class' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not include class name added via add_class()'
+ );
+ $this->assertSame(
+ 'foo-class',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) did not return class name added via add_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_calling_add_class_twice_creates_a_class_attribute_with_both_class_names_when_there_is_no_class_attribute() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->add_class( 'foo-class' );
+ $p->add_class( 'bar-class' );
+
+ $this->assertSame(
+ '',
+ $p->get_updated_html(),
+ 'Updated HTML does not include class names added via subsequent add_class() calls'
+ );
+ $this->assertSame(
+ 'foo-class bar-class',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) did not return class names added via subsequent add_class() calls"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_remove_class_does_not_change_the_markup_when_there_is_no_class_attribute() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->remove_class( 'foo-class' );
+
+ $this->assertSame(
+ self::HTML_SIMPLE,
+ $p->get_updated_html(),
+ 'Updated HTML includes class name that was removed by remove_class()'
+ );
+ $this->assertNull(
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) did not return null for class name that was removed by remove_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_add_class_appends_class_names_to_the_existing_class_attribute_when_one_already_exists() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'foo-class' );
+ $p->add_class( 'bar-class' );
+
+ $this->assertSame(
+ '',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect class names added to existing class attribute via subsequent add_class() calls'
+ );
+ $this->assertSame(
+ 'main with-border foo-class bar-class',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) does not reflect class names added to existing class attribute via subsequent add_class() calls"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_remove_class_removes_a_single_class_from_the_class_attribute_when_one_exists() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->remove_class( 'main' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect class name removed from existing class attribute via remove_class()'
+ );
+ $this->assertSame(
+ ' with-border',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) does not reflect class name removed from existing class attribute via remove_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_calling_remove_class_with_all_listed_class_names_removes_the_existing_class_attribute_from_the_markup() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->remove_class( 'main' );
+ $p->remove_class( 'with-border' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect class attribute removed via subesequent remove_class() calls'
+ );
+ $this->assertNull(
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) did not return null for class attribute removed via subesequent remove_class() calls"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_add_class_does_not_add_duplicate_class_names() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'with-border' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect deduplicated class name added via add_class()'
+ );
+ $this->assertSame(
+ 'main with-border',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) does not reflect deduplicated class name added via add_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_add_class_preserves_class_name_order_when_a_duplicate_class_name_is_added() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'main' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect class name order after adding duplicated class name via add_class()'
+ );
+ $this->assertSame(
+ 'main with-border',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) does not reflect class name order after adding duplicated class name added via add_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_add_class_when_there_is_a_class_attribute_with_excessive_whitespaces() {
+ $p = new WP_HTML_Tag_Processor(
+ 'Text'
+ );
+ $p->next_tag();
+ $p->add_class( 'foo-class' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect existing excessive whitespace after adding class name via add_class()'
+ );
+ $this->assertSame(
+ ' main with-border foo-class',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) does not reflect existing excessive whitespace after adding class name via add_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_remove_class_preserves_whitespaces_when_there_is_a_class_attribute_with_excessive_whitespaces() {
+ $p = new WP_HTML_Tag_Processor(
+ 'Text'
+ );
+ $p->next_tag();
+ $p->remove_class( 'with-border' );
+
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect existing excessive whitespace after removing class name via remove_class()'
+ );
+ $this->assertSame(
+ ' main',
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) does not reflect existing excessive whitespace after removing class name via removing_class()"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_removing_all_classes_removes_the_existing_class_attribute_from_the_markup_even_when_excessive_whitespaces_are_present() {
+ $p = new WP_HTML_Tag_Processor(
+ 'Text'
+ );
+ $p->next_tag();
+ $p->remove_class( 'main' );
+ $p->remove_class( 'with-border' );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ 'Updated HTML does not reflect removed class attribute after removing all class names via remove_class()'
+ );
+ $this->assertNull(
+ $p->get_attribute( 'class' ),
+ "get_attribute( 'class' ) did not return null after removing all class names via remove_class()"
+ );
+ }
+
+ /**
+ * When add_class( $different_value ) is called _after_ set_attribute( 'class', $value ), the
+ * final class name should be "$value $different_value". In other words, the `add_class` call
+ * should append its class to the one(s) set by `set_attribute`. When `add_class( $different_value )`
+ * is called _before_ `set_attribute( 'class', $value )`, however, the final class name should be
+ * "$value" instead, as any direct updates to the `class` attribute supersede any changes enqueued
+ * via the class builder methods.
+ *
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ */
+ public function test_set_attribute_takes_priority_over_add_class() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'add_class' );
+ $p->set_attribute( 'class', 'set_attribute' );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ "Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+ );
+ $this->assertSame(
+ 'set_attribute',
+ $p->get_attribute( 'class' ),
+ "Calling get_attribute after updating first tag's attributes did not return the expected class name"
+ );
+
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->set_attribute( 'class', 'set_attribute' );
+ $p->add_class( 'add_class' );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ "Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+ );
+ $this->assertSame(
+ 'set_attribute add_class',
+ $p->get_attribute( 'class' ),
+ "Calling get_attribute after updating first tag's attributes did not return the expected class name"
+ );
+ }
+
+ /**
+ * When add_class( $different_value ) is called _after_ set_attribute( 'class', $value ), the
+ * final class name should be "$value $different_value". In other words, the `add_class` call
+ * should append its class to the one(s) set by `set_attribute`. When `add_class( $different_value )`
+ * is called _before_ `set_attribute( 'class', $value )`, however, the final class name should be
+ * "$value" instead, as any direct updates to the `class` attribute supersede any changes enqueued
+ * via the class builder methods.
+ *
+ * This is still true when reading enqueued updates before calling `get_updated_html()`.
+ *
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_set_attribute_takes_priority_over_add_class_even_before_updating() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->add_class( 'add_class' );
+ $p->set_attribute( 'class', 'set_attribute' );
+ $this->assertSame(
+ 'set_attribute',
+ $p->get_attribute( 'class' ),
+ "Calling get_attribute after updating first tag's attributes did not return the expected class name"
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ "Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+ );
+
+ $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $p->next_tag();
+ $p->set_attribute( 'class', 'set_attribute' );
+ $p->add_class( 'add_class' );
+ $this->assertSame(
+ 'set_attribute add_class',
+ $p->get_attribute( 'class' ),
+ "Calling get_attribute after updating first tag's attributes did not return the expected class name"
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ "Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_add_class_overrides_boolean_class_attribute() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'class', true );
+ $p->add_class( 'add_class' );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ "Updated HTML doesn't reflect class added via add_class that was originally set as boolean attribute"
+ );
+ $this->assertSame(
+ 'add_class',
+ $p->get_attribute( 'class' ),
+ "get_attribute (called after get_updated_html()) doesn't reflect class added via add_class that was originally set as boolean attribute"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_add_class_overrides_boolean_class_attribute_even_before_updating() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $p->next_tag();
+ $p->set_attribute( 'class', true );
+ $p->add_class( 'add_class' );
+ $this->assertSame(
+ 'add_class',
+ $p->get_attribute( 'class' ),
+ "get_attribute (called before get_updated_html()) doesn't reflect class added via add_class that was originally set as boolean attribute"
+ );
+ $this->assertSame(
+ 'Text',
+ $p->get_updated_html(),
+ "Updated HTML doesn't reflect class added via add_class that was originally set as boolean attribute"
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::remove_attribute
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::remove_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_advanced_use_case() {
+ $input = <<
+
+
Text
'
+ );
+ $p->next_tag(
+ array(
+ 'tag_name' => 'div',
+ 'id' => 'first',
+ )
+ );
+ $p->remove_attribute( 'id' );
+ $p->next_tag(
+ array(
+ 'tag_name' => 'span',
+ 'id' => 'second',
+ )
+ );
+ $p->set_attribute( 'id', 'single-quote' );
+ $this->assertSame(
+ 'Text
',
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_set_attribute_with_value_equals_to_true_adds_a_boolean_html_attribute_with_implicit_value() {
+ $p = new WP_HTML_Tag_Processor(
+ ''
+ );
+ $p->next_tag( 'input' );
+ $p->set_attribute( 'checked', true );
+ $this->assertSame(
+ '',
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_setting_a_boolean_attribute_to_false_removes_it_from_the_markup() {
+ $p = new WP_HTML_Tag_Processor(
+ ''
+ );
+ $p->next_tag( 'input' );
+ $p->set_attribute( 'checked', false );
+ $this->assertSame(
+ '',
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_setting_a_missing_attribute_to_false_does_not_change_the_markup() {
+ $html_input = '';
+ $p = new WP_HTML_Tag_Processor( $html_input );
+ $p->next_tag( 'input' );
+ $p->set_attribute( 'checked', false );
+ $this->assertSame( $html_input, $p->get_updated_html() );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_setting_a_boolean_attribute_to_a_string_value_adds_explicit_value_to_the_markup() {
+ $p = new WP_HTML_Tag_Processor(
+ ''
+ );
+ $p->next_tag( 'input' );
+ $p->set_attribute( 'checked', 'checked' );
+ $this->assertSame(
+ '',
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::get_tag
+ * @covers WP_HTML_Tag_Processor::next_tag
+ */
+ public function test_unclosed_script_tag_should_not_cause_an_infinite_loop() {
+ $p = new WP_HTML_Tag_Processor( '',
+ ),
+
+ 'Simple uppercase script tag' => array(
+ '',
+ ),
+
+ 'Script with a comment opener inside should end at the next script tag closer (dash dash escaped state)' => array(
+ '-->',
+ ),
+
+ 'Script with a comment opener and a script tag opener inside should end two script tag closer later (double escaped state)' => array(
+ '-->',
+ ),
+
+ 'Double escaped script with a tricky opener' => array(
+ '">',
+ ),
+
+ 'Double escaped script with a tricky closer' => array(
+ '">',
+ ),
+
+ 'Double escaped, then escaped, then double escaped' => array(
+ '',
+ ),
+
+ 'Script with a commented a script tag opener inside should at the next tag closer (dash dash escaped state)' => array(
+ '-->',
+ ),
+
+ 'Script closer with another script tag in closer attributes' => array(
+ '',
+ ),
+
+ 'Script closer with attributes' => array(
+ '',
+ ),
+
+ 'Script opener with title closer inside' => array(
+ '',
+ ),
+
+ 'Complex script with many parsing states' => array(
+ '-->-->',
+ ),
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::next_tag
+ *
+ * @dataProvider data_next_tag_ignores_contents_of_rcdata_tag
+ *
+ * @param string $rcdata_then_div HTML with RCDATA before a DIV.
+ * @param string $rcdata_tag RCDATA tag.
+ */
+ public function test_next_tag_ignores_contents_of_rcdata_tag( $rcdata_then_div, $rcdata_tag ) {
+ $p = new WP_HTML_Tag_Processor( $rcdata_then_div );
+ $p->next_tag();
+ $this->assertSame( $rcdata_tag, $p->get_tag(), "The first found tag was not '$rcdata_tag'" );
+ $p->next_tag();
+ $this->assertSame( 'DIV', $p->get_tag(), "The second found tag was not 'div'" );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_next_tag_ignores_contents_of_rcdata_tag() {
+ return array(
+ 'simple textarea' => array(
+ 'rcdata_then_div' => '',
+ 'rcdata_tag' => 'TEXTAREA',
+ ),
+ 'simple title' => array(
+ 'rcdata_then_div' => '' ),
+ 'Unexpected SCRIPT closer after DIV' => array( 'console.log("
")
' ),
+ 'Unexpected SCRIPT closer before DIV' => array( 'console.log("")
' ),
+ 'Missing SCRIPT closer' => array( '
' ),
+ 'TITLE before DIV' => array( '<div>
' ),
+ 'SCRIPT inside TITLE' => array( '<script><div>
' ),
+ 'TITLE in TEXTAREA' => array( '
' ),
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::next_tag
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_can_query_and_update_wrongly_nested_tags() {
+ $p = new WP_HTML_Tag_Processor(
+ '123 is a tag.test',
+ 'expected' => '<3 is a heart but is a tag.test',
+ ),
+ 'does not parse <*' => array(
+ 'input' => 'The applicative operator <* works well in Haskell; is what?test',
+ 'expected' => 'The applicative operator <* works well in Haskell; is what?test',
+ ),
+ ' in content' => array(
+ 'input' => 'test',
+ 'expected' => 'test',
+ ),
+ 'custom asdf attribute' => array(
+ 'input' => '
test', + 'expected' => '
test', + ), + 'custom data-* attribute' => array( + 'input' => '',
+ 'expected' => '',
+ ),
+ 'tag inside of CDATA' => array(
+ 'input' => ' a HTML Tag]]>test',
+ 'expected' => ' a HTML Tag]]>test',
+ ),
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::next_tag
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ *
+ * @dataProvider data_updating_attributes_in_malformed_html
+ *
+ * @param string $html HTML to process.
+ * @param string $expected Expected updated HTML.
+ */
+ public function test_updating_attributes_in_malformed_html( $html, $expected ) {
+ $p = new WP_HTML_Tag_Processor( $html );
+ $p->next_tag();
+ $p->set_attribute( 'foo', 'bar' );
+ $p->add_class( 'firstTag' );
+ $p->next_tag();
+ $p->add_class( 'secondTag' );
+
+ $this->assertSame(
+ $expected,
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_updating_attributes_in_malformed_html() {
+ $null_byte = chr( 0 );
+
+ return array(
+ 'Invalid entity inside attribute value' => array(
+ 'input' => '
test',
+ 'expected' => 'test',
+ ),
+ 'HTML tag opening inside attribute value' => array(
+ 'input' => '
test', + 'expected' => '
test', + ), + 'Double-quotes escaped in double-quote attribute value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unquoted attribute value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unquoted attribute value with tag-like value' => array( + 'input' => '
>test', + 'expected' => '
>test', + ), + 'Unquoted attribute value with tag-like value followed by tag-like data' => array( + 'input' => '
>test', + 'expected' => '
>test', + ), + 'id=&quo;code' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'id/test=5' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '
as the id value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'id=>code' => array( + 'input' => '
code>test', + 'expected' => '
code>test', + ), + 'id"quo="test"' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'id without double quotation marks around null byte' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unexpected > before an attribute' => array( + 'input' => '
id="test">test', + 'expected' => '
id="test">test', + ), + 'Unexpected = before an attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unexpected === before an attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Missing closing data-tag tag' => array( + 'input' => 'The applicative operator <* works well in Haskell; is what?test',
+ 'expected' => 'The applicative operator <* works well in Haskell; is what?test',
+ ),
+ 'Missing closing t3 tag' => array(
+ 'input' => '<3 is a heart but is a tag.test',
+ 'expected' => '<3 is a heart but is a tag.test',
+ ),
+ 'invalid comment opening tag' => array(
+ 'input' => 'test',
+ 'expected' => 'test',
+ ),
+ '=asdf as attribute name' => array(
+ 'input' => '
test', + 'expected' => '
test', + ), + '== as attribute name with value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '=5 as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '= as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '== as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '=== as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'unsupported disabled attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'malformed custom attributes' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Multiple unclosed tags treated as a single tag' => array( + 'input' => <<
+ test
+HTML
+ ,
+ 'expected' => <<
+ test
+HTML
+ ,
+ ),
+ '
' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '
' => array( + 'input' => '
test', + 'expected' => '
test', + ), + ); + } +}
456
789' + ); + $p->next_tag( 'span' ); + $p->set_attribute( 'class', 'span-class' ); + $p->next_tag( 'p' ); + $p->set_attribute( 'class', 'p-class' ); + $this->assertSame( + '123456
789', + $p->get_updated_html() + ); + } + + /** + * @ticket 56299 + * + * @covers WP_HTML_Tag_Processor::next_tag + * @covers WP_HTML_Tag_Processor::remove_attribute + * @covers WP_HTML_Tag_Processor::get_updated_html + */ + public function test_removing_specific_attributes_in_malformed_html() { + $p = new WP_HTML_Tag_Processor( self::HTML_MALFORMED ); + $p->next_tag( 'span' ); + $p->remove_attribute( 'Notifications<' ); + $this->assertSame( + 'Back to notifications
',
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::next_Tag
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ */
+ public function test_updating_specific_attributes_in_malformed_html() {
+ $p = new WP_HTML_Tag_Processor( self::HTML_MALFORMED );
+ $p->next_tag( 'span' );
+ $p->set_attribute( 'id', 'first' );
+ $p->next_tag( 'span' );
+ $p->set_attribute( 'id', 'second' );
+ $this->assertSame(
+ 'Back to notifications
',
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * @ticket 56299
+ *
+ * @covers WP_HTML_Tag_Processor::next_tag
+ * @covers WP_HTML_Tag_Processor::set_attribute
+ * @covers WP_HTML_Tag_Processor::add_class
+ * @covers WP_HTML_Tag_Processor::get_updated_html
+ *
+ * @dataProvider data_updating_attributes
+ *
+ * @param string $html HTML to process.
+ * @param string $expected Expected updated HTML.
+ */
+ public function test_updating_attributes( $html, $expected ) {
+ $p = new WP_HTML_Tag_Processor( $html );
+ $p->next_tag();
+ $p->set_attribute( 'foo', 'bar' );
+ $p->add_class( 'firstTag' );
+ $p->next_tag();
+ $p->add_class( 'secondTag' );
+
+ $this->assertSame(
+ $expected,
+ $p->get_updated_html()
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_updating_attributes() {
+ return array(
+ 'tags inside of a comment' => array(
+ 'input' => 'test',
+ 'expected' => 'test',
+ ),
+ 'does not parse <3' => array(
+ 'input' => '<3 is a heart but test', + 'expected' => '
test', + ), + 'custom data-* attribute' => array( + 'input' => '
Some content for a test
Some content for a test
test',
+ 'expected' => 'test',
+ ),
+ 'HTML tag opening inside attribute value' => array(
+ 'input' => 'This <is> a <strong is="true">thing.This <is> a <strong is="true">thing.This <is> a <strong is="true">thing.This <is> a <strong is="true">thing.test', + 'expected' => '
test', + ), + 'Unquoted attribute values' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Double-quotes escaped in double-quote attribute value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unquoted attribute value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unquoted attribute value with tag-like value' => array( + 'input' => '
>test', + 'expected' => '
>test', + ), + 'Unquoted attribute value with tag-like value followed by tag-like data' => array( + 'input' => '
>test', + 'expected' => '
>test', + ), + 'id=&quo;code' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'id/test=5' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '
as the id value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'id=>code' => array( + 'input' => '
code>test', + 'expected' => '
code>test', + ), + 'id"quo="test"' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'id without double quotation marks around null byte' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unexpected > before an attribute' => array( + 'input' => '
id="test">test', + 'expected' => '
id="test">test', + ), + 'Unexpected = before an attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Unexpected === before an attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Missing closing data-tag tag' => array( + 'input' => 'The applicative operator <* works well in Haskell;
test', + 'expected' => '
test', + ), + '== as attribute name with value' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '=5 as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '= as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '== as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '=== as attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'unsupported disabled attribute' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'malformed custom attributes' => array( + 'input' => '
test', + 'expected' => '
test', + ), + 'Multiple unclosed tags treated as a single tag' => array( + 'input' => <<
' => array( + 'input' => '
test', + 'expected' => '
test', + ), + '
' => array( + 'input' => '
test', + 'expected' => '
test', + ), + ); + } +}