- %2$s
";
+ if ( isset( $attributes['prefix'] ) && $attributes['prefix'] ) {
+ $prefix .= '' . $attributes['prefix'] . '';
+ }
+
+ $suffix = '
';
+ if ( isset( $attributes['suffix'] ) && $attributes['suffix'] ) {
+ $suffix = '' . $attributes['suffix'] . '' . $suffix;
+ }
+
+ $post_terms = get_the_term_list(
+ $block->context['postId'],
+ $attributes['term'],
+ wp_kses_post( $prefix ),
+ '' . esc_html( $separator ) . '',
+ wp_kses_post( $suffix )
+ );
+
+ if ( is_wp_error( $post_terms ) || empty( $post_terms ) ) {
+ return '';
+ }
+
+ return $post_terms;
+}
+
+/**
+ * Returns the available variations for the `core/post-terms` block.
+ *
+ * @since 6.5.0
+ *
+ * @return array The available variations for the block.
+ */
+function block_core_post_terms_build_variations() {
+ $taxonomies = get_taxonomies(
+ array(
+ 'publicly_queryable' => true,
+ 'show_in_rest' => true,
+ ),
+ 'objects'
+ );
+
+ // Split the available taxonomies to `built_in` and custom ones,
+ // in order to prioritize the `built_in` taxonomies at the
+ // search results.
+ $built_ins = array();
+ $custom_variations = array();
+
+ // Create and register the eligible taxonomies variations.
+ foreach ( $taxonomies as $taxonomy ) {
+ $variation = array(
+ 'name' => $taxonomy->name,
+ 'title' => $taxonomy->label,
+ 'description' => sprintf(
+ /* translators: %s: taxonomy's label */
+ __( 'Display a list of assigned terms from the taxonomy: %s' ),
+ $taxonomy->label
+ ),
+ 'attributes' => array(
+ 'term' => $taxonomy->name,
+ ),
+ 'isActive' => array( 'term' ),
+ 'scope' => array( 'inserter', 'transform' ),
+ );
+ // Set the category variation as the default one.
+ if ( 'category' === $taxonomy->name ) {
+ $variation['isDefault'] = true;
+ }
+ if ( $taxonomy->_builtin ) {
+ $built_ins[] = $variation;
+ } else {
+ $custom_variations[] = $variation;
+ }
+ }
+
+ return array_merge( $built_ins, $custom_variations );
+}
+
+/**
+ * Registers the `core/post-terms` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_post_terms() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-terms',
+ array(
+ 'render_callback' => 'render_block_core_post_terms',
+ 'variation_callback' => 'block_core_post_terms_build_variations',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_post_terms' );
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
new file mode 100644
index 0000000000000..e7567ba657c3b
--- /dev/null
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -0,0 +1,80 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/post-terms",
+ "title": "Post Terms",
+ "category": "theme",
+ "description": "Post terms.",
+ "textdomain": "default",
+ "attributes": {
+ "term": {
+ "type": "string"
+ },
+ "textAlign": {
+ "type": "string"
+ },
+ "separator": {
+ "type": "string",
+ "default": ", "
+ },
+ "prefix": {
+ "type": "string",
+ "default": "",
+ "role": "content"
+ },
+ "suffix": {
+ "type": "string",
+ "default": "",
+ "role": "content"
+ }
+ },
+ "usesContext": [ "postId", "postType" ],
+ "example": {
+ "viewportWidth": 350
+ },
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-post-terms"
+}
diff --git a/src/wp-includes/blocks/post-time-to-read.php b/src/wp-includes/blocks/post-time-to-read.php
new file mode 100644
index 0000000000000..bce545a2927d2
--- /dev/null
+++ b/src/wp-includes/blocks/post-time-to-read.php
@@ -0,0 +1,185 @@
+ '/<\/?[a-z][^>]*?>/i',
+ 'html_comment_regexp' => '//',
+ 'space_regexp' => '/ | /i',
+ 'html_entity_regexp' => '/&\S+?;/',
+ 'connector_regexp' => "/--|\x{2014}/u",
+ 'remove_regexp' => "/[\x{0021}-\x{0040}\x{005B}-\x{0060}\x{007B}-\x{007E}\x{0080}-\x{00BF}\x{00D7}\x{00F7}\x{2000}-\x{2BFF}\x{2E00}-\x{2E7F}]/u",
+ 'astral_regexp' => "/[\x{010000}-\x{10FFFF}]/u",
+ 'words_regexp' => '/\S\s+/u',
+ 'characters_excluding_spaces_regexp' => '/\S/u',
+ 'characters_including_spaces_regexp' => "/[^\f\n\r\t\v\x{00AD}\x{2028}\x{2029}]/u",
+ );
+
+ $count = 0;
+
+ if ( '' === trim( $text ) ) {
+ return $count;
+ }
+
+ // Sanitize type to one of three possibilities: 'words', 'characters_excluding_spaces' or 'characters_including_spaces'.
+ if ( 'characters_excluding_spaces' !== $type && 'characters_including_spaces' !== $type ) {
+ $type = 'words';
+ }
+
+ $text .= "\n";
+
+ // Replace all HTML with a new-line.
+ $text = preg_replace( $settings['html_regexp'], "\n", $text );
+
+ // Remove all HTML comments.
+ $text = preg_replace( $settings['html_comment_regexp'], '', $text );
+
+ // If a shortcode regular expression has been provided use it to remove shortcodes.
+ if ( ! empty( $settings['shortcodes_regexp'] ) ) {
+ $text = preg_replace( $settings['shortcodes_regexp'], "\n", $text );
+ }
+
+ // Normalize non-breaking space to a normal space.
+ $text = preg_replace( $settings['space_regexp'], ' ', $text );
+
+ if ( 'words' === $type ) {
+ // Remove HTML Entities.
+ $text = preg_replace( $settings['html_entity_regexp'], '', $text );
+
+ // Convert connectors to spaces to count attached text as words.
+ $text = preg_replace( $settings['connector_regexp'], ' ', $text );
+
+ // Remove unwanted characters.
+ $text = preg_replace( $settings['remove_regexp'], '', $text );
+ } else {
+ // Convert HTML Entities to "a".
+ $text = preg_replace( $settings['html_entity_regexp'], 'a', $text );
+
+ // Remove surrogate points.
+ $text = preg_replace( $settings['astral_regexp'], 'a', $text );
+ }
+
+ // Match with the selected type regular expression to count the items.
+ return (int) preg_match_all( $settings[ $type . '_regexp' ], $text );
+}
+
+/**
+ * Renders the `core/post-time-to-read` block on the server.
+ *
+ * @since 6.9.0
+ *
+ * @param array $attributes Block attributes.
+ * @param string $content Block default content.
+ * @param WP_Block $block Block instance.
+ * @return string Returns the rendered post author name block.
+ */
+function render_block_core_post_time_to_read( $attributes, $content, $block ) {
+ if ( ! isset( $block->context['postId'] ) ) {
+ return '';
+ }
+
+ $content = get_the_content();
+ $average_reading_rate = isset( $attributes['averageReadingSpeed'] ) ? $attributes['averageReadingSpeed'] : 189;
+
+ $display_mode = isset( $attributes['displayMode'] ) ? $attributes['displayMode'] : 'time';
+
+ $word_count_type = wp_get_word_count_type();
+ $total_words = block_core_post_time_to_read_word_count( $content, $word_count_type );
+
+ $parts = array();
+
+ // Add "time to read" part, if enabled.
+ if ( 'time' === $display_mode ) {
+ if ( ! empty( $attributes['displayAsRange'] ) ) {
+ // Calculate faster reading rate with 20% speed = lower minutes,
+ // and slower reading rate with 20% speed = higher minutes.
+ $min_minutes = max( 1, (int) round( $total_words / $average_reading_rate * 0.8 ) );
+ $max_minutes = max( 1, (int) round( $total_words / $average_reading_rate * 1.2 ) );
+ if ( $min_minutes === $max_minutes ) {
+ $max_minutes = $min_minutes + 1;
+ }
+ /* translators: 1: minimum minutes, 2: maximum minutes to read the post. */
+ $time_string = sprintf(
+ /* translators: 1: minimum minutes, 2: maximum minutes to read the post. */
+ _x( '%1$s–%2$s minutes', 'Range of minutes to read' ),
+ $min_minutes,
+ $max_minutes
+ );
+ } else {
+ $minutes_to_read = max( 1, (int) round( $total_words / $average_reading_rate ) );
+ $time_string = sprintf(
+ /* translators: %s: the number of minutes to read the post. */
+ _n( '%s minute', '%s minutes', $minutes_to_read ),
+ $minutes_to_read
+ );
+ }
+ $parts[] = $time_string;
+ }
+
+ // Add "word count" part, if enabled.
+ if ( 'words' === $display_mode ) {
+ $word_count_string = 'words' === $word_count_type ? sprintf(
+ /* translators: %s: the number of words in the post. */
+ _n( '%s word', '%s words', $total_words ),
+ number_format_i18n( $total_words )
+ ) : sprintf(
+ /* translators: %s: the number of characters in the post. */
+ _n( '%s character', '%s characters', $total_words ),
+ number_format_i18n( $total_words )
+ );
+ $parts[] = $word_count_string;
+ }
+
+ $display_string = implode( '', $parts ); + + $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}"; + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) ); + + return sprintf( + '
%2$s
',
+ $wrapper_attributes,
+ $display_string
+ );
+}
+
+
+/**
+ * Registers the `core/post-time-to-read` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_post_time_to_read() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-time-to-read',
+ array(
+ 'render_callback' => 'render_block_core_post_time_to_read',
+ )
+ );
+}
+
+add_action( 'init', 'register_block_core_post_time_to_read' );
diff --git a/src/wp-includes/blocks/post-time-to-read/block.json b/src/wp-includes/blocks/post-time-to-read/block.json
new file mode 100644
index 0000000000000..386312e00434e
--- /dev/null
+++ b/src/wp-includes/blocks/post-time-to-read/block.json
@@ -0,0 +1,67 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/post-time-to-read",
+ "title": "Time to Read",
+ "category": "theme",
+ "description": "Show minutes required to finish reading the post. Can also show a word count.",
+ "textdomain": "default",
+ "usesContext": [ "postId", "postType" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "displayAsRange": {
+ "type": "boolean",
+ "default": true
+ },
+ "displayMode": {
+ "type": "string",
+ "default": "time"
+ },
+ "averageReadingSpeed": {
+ "type": "number",
+ "default": 189
+ }
+ },
+ "supports": {
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "html": false,
+ "spacing": {
+ "margin": true,
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php
new file mode 100644
index 0000000000000..ed27f2e4158eb
--- /dev/null
+++ b/src/wp-includes/blocks/post-title.php
@@ -0,0 +1,74 @@
+context['postId'] ) ) {
+ return '';
+ }
+
+ /**
+ * The `$post` argument is intentionally omitted so that changes are reflected when previewing a post.
+ * See: https://github.com/WordPress/gutenberg/pull/37622#issuecomment-1000932816.
+ */
+ $title = get_the_title();
+
+ if ( ! $title ) {
+ return '';
+ }
+
+ $tag_name = 'h2';
+ if ( isset( $attributes['level'] ) ) {
+ $tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
+ }
+
+ if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
+ $rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
+ $title = sprintf( '%4$s', esc_url( get_the_permalink( $block->context['postId'] ) ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
+ }
+
+ $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',
+ $tag_name,
+ $wrapper_attributes,
+ $title
+ );
+}
+
+/**
+ * Registers the `core/post-title` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_post_title() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-title',
+ array(
+ 'render_callback' => 'render_block_core_post_title',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_post_title' );
diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json
new file mode 100644
index 0000000000000..5587d71b148d0
--- /dev/null
+++ b/src/wp-includes/blocks/post-title/block.json
@@ -0,0 +1,87 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/post-title",
+ "title": "Title",
+ "category": "theme",
+ "description": "Displays the title of a post, page, or any other content-type.",
+ "textdomain": "default",
+ "usesContext": [ "postId", "postType", "queryId" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "level": {
+ "type": "number",
+ "default": 2
+ },
+ "levelOptions": {
+ "type": "array"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false,
+ "role": "content"
+ },
+ "rel": {
+ "type": "string",
+ "attribute": "rel",
+ "default": "",
+ "role": "content"
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self",
+ "role": "content"
+ }
+ },
+ "example": {
+ "viewportWidth": 350
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-post-title"
+}
diff --git a/src/wp-includes/blocks/preformatted/block.json b/src/wp-includes/blocks/preformatted/block.json
new file mode 100644
index 0000000000000..c25b8ce37093a
--- /dev/null
+++ b/src/wp-includes/blocks/preformatted/block.json
@@ -0,0 +1,61 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/preformatted",
+ "title": "Preformatted",
+ "category": "text",
+ "description": "Add text that respects your spacing and tabs, and also allows styling.",
+ "textdomain": "default",
+ "attributes": {
+ "content": {
+ "type": "rich-text",
+ "source": "rich-text",
+ "selector": "pre",
+ "__unstablePreserveWhiteSpace": true,
+ "role": "content"
+ }
+ },
+ "supports": {
+ "anchor": true,
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "spacing": {
+ "padding": true,
+ "margin": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-preformatted"
+}
diff --git a/src/wp-includes/blocks/pullquote/block.json b/src/wp-includes/blocks/pullquote/block.json
new file mode 100644
index 0000000000000..271bba74d0252
--- /dev/null
+++ b/src/wp-includes/blocks/pullquote/block.json
@@ -0,0 +1,92 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/pullquote",
+ "title": "Pullquote",
+ "category": "text",
+ "description": "Give special visual emphasis to a quote from your text.",
+ "textdomain": "default",
+ "attributes": {
+ "value": {
+ "type": "rich-text",
+ "source": "rich-text",
+ "selector": "p",
+ "role": "content"
+ },
+ "citation": {
+ "type": "rich-text",
+ "source": "rich-text",
+ "selector": "cite",
+ "role": "content"
+ },
+ "textAlign": {
+ "type": "string"
+ }
+ },
+ "supports": {
+ "anchor": true,
+ "align": [ "left", "right", "wide", "full" ],
+ "background": {
+ "backgroundImage": true,
+ "backgroundSize": true,
+ "__experimentalDefaultControls": {
+ "backgroundImage": true
+ }
+ },
+ "color": {
+ "gradients": true,
+ "background": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "dimensions": {
+ "minHeight": true,
+ "__experimentalDefaultControls": {
+ "minHeight": false
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true
+ }
+ },
+ "__experimentalStyle": {
+ "typography": {
+ "fontSize": "1.5em",
+ "lineHeight": "1.6"
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "editorStyle": "wp-block-pullquote-editor",
+ "style": "wp-block-pullquote"
+}
diff --git a/src/wp-includes/blocks/query-no-results.php b/src/wp-includes/blocks/query-no-results.php
new file mode 100644
index 0000000000000..34d6b321cbd6b
--- /dev/null
+++ b/src/wp-includes/blocks/query-no-results.php
@@ -0,0 +1,65 @@
+context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
+ $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
+
+ // Override the custom query with the global query if needed.
+ $use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] );
+ if ( $use_global_query ) {
+ global $wp_query;
+ $query = $wp_query;
+ } else {
+ $query_args = build_query_vars_from_query_block( $block, $page );
+ $query = new WP_Query( $query_args );
+ }
+
+ if ( $query->post_count > 0 ) {
+ return '';
+ }
+
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ return sprintf(
+ '%2$s
',
+ $wrapper_attributes,
+ $content
+ );
+}
+
+/**
+ * Registers the `core/query-no-results` block on the server.
+ *
+ * @since 6.0.0
+ */
+function register_block_core_query_no_results() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-no-results',
+ array(
+ 'render_callback' => 'render_block_core_query_no_results',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_no_results' );
diff --git a/src/wp-includes/blocks/query-no-results/block.json b/src/wp-includes/blocks/query-no-results/block.json
new file mode 100644
index 0000000000000..44d2ceef987e2
--- /dev/null
+++ b/src/wp-includes/blocks/query-no-results/block.json
@@ -0,0 +1,36 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-no-results",
+ "title": "No Results",
+ "category": "theme",
+ "description": "Contains the block elements used to render content when no query results are found.",
+ "ancestor": [ "core/query" ],
+ "textdomain": "default",
+ "usesContext": [ "queryId", "query" ],
+ "supports": {
+ "align": true,
+ "reusable": false,
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/query-pagination-next.php b/src/wp-includes/blocks/query-pagination-next.php
new file mode 100644
index 0000000000000..d574f94093846
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination-next.php
@@ -0,0 +1,102 @@
+context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
+ $enhanced_pagination = isset( $block->context['enhancedPagination'] ) && $block->context['enhancedPagination'];
+ $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
+ $max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0;
+
+ $wrapper_attributes = get_block_wrapper_attributes();
+ $show_label = isset( $block->context['showLabel'] ) ? (bool) $block->context['showLabel'] : true;
+ $default_label = __( 'Next Page' );
+ $label_text = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+ $label = $show_label ? $label_text : '';
+ $pagination_arrow = get_query_pagination_arrow( $block, true );
+
+ if ( ! $label ) {
+ $wrapper_attributes .= ' aria-label="' . $label_text . '"';
+ }
+ if ( $pagination_arrow ) {
+ $label .= $pagination_arrow;
+ }
+ $content = '';
+
+ // Check if the pagination is for Query that inherits the global context.
+ if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
+ $filter_link_attributes = static function () use ( $wrapper_attributes ) {
+ return $wrapper_attributes;
+ };
+ add_filter( 'next_posts_link_attributes', $filter_link_attributes );
+ // Take into account if we have set a bigger `max page`
+ // than what the query has.
+ global $wp_query;
+ if ( $max_page > $wp_query->max_num_pages ) {
+ $max_page = $wp_query->max_num_pages;
+ }
+ $content = get_next_posts_link( $label, $max_page );
+ remove_filter( 'next_posts_link_attributes', $filter_link_attributes );
+ } elseif ( ! $max_page || $max_page > $page ) {
+ $custom_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) );
+ $custom_query_max_pages = (int) $custom_query->max_num_pages;
+ if ( $custom_query_max_pages && $custom_query_max_pages !== $page ) {
+ $content = sprintf(
+ '%3$s',
+ esc_url( add_query_arg( $page_key, $page + 1 ) ),
+ $wrapper_attributes,
+ $label
+ );
+ }
+ wp_reset_postdata(); // Restore original Post Data.
+ }
+
+ if ( $enhanced_pagination && isset( $content ) ) {
+ $p = new WP_HTML_Tag_Processor( $content );
+ if ( $p->next_tag(
+ array(
+ 'tag_name' => 'a',
+ 'class_name' => 'wp-block-query-pagination-next',
+ )
+ ) ) {
+ $p->set_attribute( 'data-wp-key', 'query-pagination-next' );
+ $p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+ $p->set_attribute( 'data-wp-on--mouseenter', 'core/query::actions.prefetch' );
+ $p->set_attribute( 'data-wp-watch', 'core/query::callbacks.prefetch' );
+ $content = $p->get_updated_html();
+ }
+ }
+
+ return $content;
+}
+
+/**
+ * Registers the `core/query-pagination-next` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_query_pagination_next() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-pagination-next',
+ array(
+ 'render_callback' => 'render_block_core_query_pagination_next',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_pagination_next' );
diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json
new file mode 100644
index 0000000000000..ec56125ee3b76
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination-next/block.json
@@ -0,0 +1,49 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-pagination-next",
+ "title": "Next Page",
+ "category": "theme",
+ "parent": [ "core/query-pagination" ],
+ "description": "Displays the next posts page link.",
+ "textdomain": "default",
+ "attributes": {
+ "label": {
+ "type": "string"
+ }
+ },
+ "usesContext": [
+ "queryId",
+ "query",
+ "paginationArrow",
+ "showLabel",
+ "enhancedPagination"
+ ],
+ "supports": {
+ "reusable": false,
+ "html": false,
+ "color": {
+ "gradients": true,
+ "text": false,
+ "__experimentalDefaultControls": {
+ "background": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/query-pagination-numbers.php b/src/wp-includes/blocks/query-pagination-numbers.php
new file mode 100644
index 0000000000000..fddf28660fe4f
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination-numbers.php
@@ -0,0 +1,133 @@
+context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
+ $enhanced_pagination = isset( $block->context['enhancedPagination'] ) && $block->context['enhancedPagination'];
+ $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
+ $max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0;
+
+ $wrapper_attributes = get_block_wrapper_attributes();
+ $content = '';
+ global $wp_query;
+ $mid_size = isset( $block->attributes['midSize'] ) ? (int) $block->attributes['midSize'] : null;
+ if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
+ // Take into account if we have set a bigger `max page`
+ // than what the query has.
+ $total = ! $max_page || $max_page > $wp_query->max_num_pages ? $wp_query->max_num_pages : $max_page;
+ $paginate_args = array(
+ 'prev_next' => false,
+ 'total' => $total,
+ );
+ if ( null !== $mid_size ) {
+ $paginate_args['mid_size'] = $mid_size;
+ }
+ $content = paginate_links( $paginate_args );
+ } else {
+ $block_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) );
+ // `paginate_links` works with the global $wp_query, so we have to
+ // temporarily switch it with our custom query.
+ $prev_wp_query = $wp_query;
+ $wp_query = $block_query;
+ $total = ! $max_page || $max_page > $wp_query->max_num_pages ? $wp_query->max_num_pages : $max_page;
+ $paginate_args = array(
+ 'base' => '%_%',
+ 'format' => "?$page_key=%#%",
+ 'current' => max( 1, $page ),
+ 'total' => $total,
+ 'prev_next' => false,
+ );
+ if ( null !== $mid_size ) {
+ $paginate_args['mid_size'] = $mid_size;
+ }
+ if ( 1 !== $page ) {
+ /**
+ * `paginate_links` doesn't use the provided `format` when the page is `1`.
+ * This is great for the main query as it removes the extra query params
+ * making the URL shorter, but in the case of multiple custom queries is
+ * problematic. It results in returning an empty link which ends up with
+ * a link to the current page.
+ *
+ * A way to address this is to add a `fake` query arg with no value that
+ * is the same for all custom queries. This way the link is not empty and
+ * preserves all the other existent query args.
+ *
+ * @see https://developer.wordpress.org/reference/functions/paginate_links/
+ *
+ * The proper fix of this should be in core. Track Ticket:
+ * @see https://core.trac.wordpress.org/ticket/53868
+ *
+ * TODO: After two WP versions (starting from the WP version the core patch landed),
+ * we should remove this and call `paginate_links` with the proper new arg.
+ */
+ $paginate_args['add_args'] = array( 'cst' => '' );
+ }
+ // We still need to preserve `paged` query param if exists, as is used
+ // for Queries that inherit from global context.
+ $paged = empty( $_GET['paged'] ) ? null : (int) $_GET['paged'];
+ if ( $paged ) {
+ $paginate_args['add_args'] = array( 'paged' => $paged );
+ }
+ $content = paginate_links( $paginate_args );
+ wp_reset_postdata(); // Restore original Post Data.
+ $wp_query = $prev_wp_query;
+ }
+
+ if ( empty( $content ) ) {
+ return '';
+ }
+
+ if ( $enhanced_pagination ) {
+ $p = new WP_HTML_Tag_Processor( $content );
+ $tag_index = 0;
+ while ( $p->next_tag(
+ array( 'class_name' => 'page-numbers' )
+ ) ) {
+ if ( null === $p->get_attribute( 'data-wp-key' ) ) {
+ $p->set_attribute( 'data-wp-key', 'index-' . $tag_index++ );
+ }
+ if ( 'A' === $p->get_tag() ) {
+ $p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+ }
+ }
+ $content = $p->get_updated_html();
+ }
+
+ return sprintf(
+ '%2$s
',
+ $wrapper_attributes,
+ $content
+ );
+}
+
+/**
+ * Registers the `core/query-pagination-numbers` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_query_pagination_numbers() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-pagination-numbers',
+ array(
+ 'render_callback' => 'render_block_core_query_pagination_numbers',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_pagination_numbers' );
diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json
new file mode 100644
index 0000000000000..8a9f0ee69f14e
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination-numbers/block.json
@@ -0,0 +1,45 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-pagination-numbers",
+ "title": "Page Numbers",
+ "category": "theme",
+ "parent": [ "core/query-pagination" ],
+ "description": "Displays a list of page numbers for pagination.",
+ "textdomain": "default",
+ "attributes": {
+ "midSize": {
+ "type": "number",
+ "default": 2
+ }
+ },
+ "usesContext": [ "queryId", "query", "enhancedPagination" ],
+ "supports": {
+ "reusable": false,
+ "html": false,
+ "color": {
+ "gradients": true,
+ "text": false,
+ "__experimentalDefaultControls": {
+ "background": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "editorStyle": "wp-block-query-pagination-numbers-editor"
+}
diff --git a/src/wp-includes/blocks/query-pagination-previous.php b/src/wp-includes/blocks/query-pagination-previous.php
new file mode 100644
index 0000000000000..ec3de8921d519
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination-previous.php
@@ -0,0 +1,95 @@
+context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
+ $enhanced_pagination = isset( $block->context['enhancedPagination'] ) && $block->context['enhancedPagination'];
+ $max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0;
+ $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
+ $wrapper_attributes = get_block_wrapper_attributes();
+ $show_label = isset( $block->context['showLabel'] ) ? (bool) $block->context['showLabel'] : true;
+ $default_label = __( 'Previous Page' );
+ $label_text = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+ $label = $show_label ? $label_text : '';
+ $pagination_arrow = get_query_pagination_arrow( $block, false );
+ if ( ! $label ) {
+ $wrapper_attributes .= ' aria-label="' . $label_text . '"';
+ }
+ if ( $pagination_arrow ) {
+ $label = $pagination_arrow . $label;
+ }
+ $content = '';
+ // Check if the pagination is for Query that inherits the global context
+ // and handle appropriately.
+ if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
+ $filter_link_attributes = static function () use ( $wrapper_attributes ) {
+ return $wrapper_attributes;
+ };
+
+ add_filter( 'previous_posts_link_attributes', $filter_link_attributes );
+ $content = get_previous_posts_link( $label );
+ remove_filter( 'previous_posts_link_attributes', $filter_link_attributes );
+ } else {
+ $block_query = new WP_Query( build_query_vars_from_query_block( $block, $page ) );
+ $block_max_pages = $block_query->max_num_pages;
+ $total = ! $max_page || $max_page > $block_max_pages ? $block_max_pages : $max_page;
+ wp_reset_postdata();
+
+ if ( 1 < $page && $page <= $total ) {
+ $content = sprintf(
+ '%3$s',
+ esc_url( add_query_arg( $page_key, $page - 1 ) ),
+ $wrapper_attributes,
+ $label
+ );
+ }
+ }
+
+ if ( $enhanced_pagination && isset( $content ) ) {
+ $p = new WP_HTML_Tag_Processor( $content );
+ if ( $p->next_tag(
+ array(
+ 'tag_name' => 'a',
+ 'class_name' => 'wp-block-query-pagination-previous',
+ )
+ ) ) {
+ $p->set_attribute( 'data-wp-key', 'query-pagination-previous' );
+ $p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+ $p->set_attribute( 'data-wp-on--mouseenter', 'core/query::actions.prefetch' );
+ $p->set_attribute( 'data-wp-watch', 'core/query::callbacks.prefetch' );
+ $content = $p->get_updated_html();
+ }
+ }
+
+ return $content;
+}
+
+/**
+ * Registers the `core/query-pagination-previous` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_query_pagination_previous() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-pagination-previous',
+ array(
+ 'render_callback' => 'render_block_core_query_pagination_previous',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_pagination_previous' );
diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json
new file mode 100644
index 0000000000000..d1e34c8630250
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination-previous/block.json
@@ -0,0 +1,49 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-pagination-previous",
+ "title": "Previous Page",
+ "category": "theme",
+ "parent": [ "core/query-pagination" ],
+ "description": "Displays the previous posts page link.",
+ "textdomain": "default",
+ "attributes": {
+ "label": {
+ "type": "string"
+ }
+ },
+ "usesContext": [
+ "queryId",
+ "query",
+ "paginationArrow",
+ "showLabel",
+ "enhancedPagination"
+ ],
+ "supports": {
+ "reusable": false,
+ "html": false,
+ "color": {
+ "gradients": true,
+ "text": false,
+ "__experimentalDefaultControls": {
+ "background": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/query-pagination.php b/src/wp-includes/blocks/query-pagination.php
new file mode 100644
index 0000000000000..acafe968c0bec
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination.php
@@ -0,0 +1,51 @@
+ __( 'Pagination' ),
+ 'class' => $classes,
+ )
+ );
+
+ return sprintf(
+ '',
+ $wrapper_attributes,
+ $content
+ );
+}
+
+/**
+ * Registers the `core/query-pagination` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_query_pagination() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-pagination',
+ array(
+ 'render_callback' => 'render_block_core_query_pagination',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_pagination' );
diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json
new file mode 100644
index 0000000000000..355b188e442d8
--- /dev/null
+++ b/src/wp-includes/blocks/query-pagination/block.json
@@ -0,0 +1,69 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-pagination",
+ "title": "Pagination",
+ "category": "theme",
+ "ancestor": [ "core/query" ],
+ "allowedBlocks": [
+ "core/query-pagination-previous",
+ "core/query-pagination-numbers",
+ "core/query-pagination-next"
+ ],
+ "description": "Displays a paginated navigation to next/previous set of posts, when applicable.",
+ "textdomain": "default",
+ "attributes": {
+ "paginationArrow": {
+ "type": "string",
+ "default": "none"
+ },
+ "showLabel": {
+ "type": "boolean",
+ "default": true
+ }
+ },
+ "usesContext": [ "queryId", "query" ],
+ "providesContext": {
+ "paginationArrow": "paginationArrow",
+ "showLabel": "showLabel"
+ },
+ "supports": {
+ "align": true,
+ "reusable": false,
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "layout": {
+ "allowSwitching": false,
+ "allowInheriting": false,
+ "default": {
+ "type": "flex"
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "editorStyle": "wp-block-query-pagination-editor",
+ "style": "wp-block-query-pagination"
+}
diff --git a/src/wp-includes/blocks/query-title.php b/src/wp-includes/blocks/query-title.php
new file mode 100644
index 0000000000000..980e1c5f58f44
--- /dev/null
+++ b/src/wp-includes/blocks/query-title.php
@@ -0,0 +1,103 @@
+context['query']['postType'] ) ? $block->context['query']['postType'] : get_post_type();
+
+ if ( ! $type ||
+ ( 'archive' === $type && ! $is_archive ) ||
+ ( 'search' === $type && ! $is_search ) ||
+ ( 'post-type' === $type && ! $post_type )
+ ) {
+ return '';
+ }
+ $title = '';
+ if ( $is_archive ) {
+ $show_prefix = isset( $attributes['showPrefix'] ) ? $attributes['showPrefix'] : true;
+ if ( ! $show_prefix ) {
+ add_filter( 'get_the_archive_title_prefix', '__return_empty_string', 1 );
+ $title = get_the_archive_title();
+ remove_filter( 'get_the_archive_title_prefix', '__return_empty_string', 1 );
+ } else {
+ $title = get_the_archive_title();
+ }
+ }
+ if ( $is_search ) {
+ $title = __( 'Search results' );
+
+ if ( isset( $attributes['showSearchTerm'] ) && $attributes['showSearchTerm'] ) {
+ $title = sprintf(
+ /* translators: %s is the search term. */
+ __( 'Search results for: "%s"' ),
+ get_search_query()
+ );
+ }
+ }
+ if ( 'post-type' === $type ) {
+ $post_type_object = get_post_type_object( $post_type );
+
+ if ( ! $post_type_object ) {
+ return '';
+ }
+
+ $post_type_name = $post_type_object->labels->singular_name;
+ $show_prefix = isset( $attributes['showPrefix'] ) ? $attributes['showPrefix'] : true;
+
+ if ( $show_prefix ) {
+ $title = sprintf(
+ /* translators: %s is the post type name. */
+ __( 'Post Type: "%s"' ),
+ $post_type_name
+ );
+ } else {
+ $title = $post_type_name;
+ }
+ }
+
+ $level = isset( $attributes['level'] ) ? (int) $attributes['level'] : 1;
+ $tag_name = 0 === $level ? 'p' : 'h' . (int) $attributes['level'];
+
+ $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+ return sprintf(
+ '<%1$s %2$s>%3$s',
+ $tag_name,
+ $wrapper_attributes,
+ $title
+ );
+}
+
+/**
+ * Registers the `core/query-title` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_query_title() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-title',
+ array(
+ 'render_callback' => 'render_block_core_query_title',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_title' );
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
new file mode 100644
index 0000000000000..549451bbfc67b
--- /dev/null
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -0,0 +1,82 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-title",
+ "title": "Query Title",
+ "category": "theme",
+ "description": "Display the query title.",
+ "textdomain": "default",
+ "attributes": {
+ "type": {
+ "type": "string"
+ },
+ "textAlign": {
+ "type": "string"
+ },
+ "level": {
+ "type": "number",
+ "default": 1
+ },
+ "levelOptions": {
+ "type": "array"
+ },
+ "showPrefix": {
+ "type": "boolean",
+ "default": true
+ },
+ "showSearchTerm": {
+ "type": "boolean",
+ "default": true
+ }
+ },
+ "example": {
+ "attributes": {
+ "type": "search"
+ }
+ },
+ "usesContext": [ "query" ],
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontStyle": true,
+ "__experimentalFontWeight": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-query-title"
+}
diff --git a/src/wp-includes/blocks/query-total.php b/src/wp-includes/blocks/query-total.php
new file mode 100644
index 0000000000000..f63bb1b98eac0
--- /dev/null
+++ b/src/wp-includes/blocks/query-total.php
@@ -0,0 +1,90 @@
+context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
+ $query_to_use = $wp_query;
+ $current_page = max( 1, (int) get_query_var( 'paged', 1 ) );
+ } else {
+ $page_key = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
+ $current_page = isset( $_GET[ $page_key ] ) ? (int) $_GET[ $page_key ] : 1;
+ $query_to_use = new WP_Query( build_query_vars_from_query_block( $block, $current_page ) );
+ }
+
+ $max_rows = $query_to_use->found_posts;
+ $posts_per_page = (int) $query_to_use->get( 'posts_per_page' );
+
+ // Calculate the range of posts being displayed.
+ $start = ( 0 === $max_rows ) ? 0 : ( ( $current_page - 1 ) * $posts_per_page + 1 );
+ $end = min( $start + $posts_per_page - 1, $max_rows );
+
+ // Prepare the display based on the `displayType` attribute.
+ $output = '';
+ switch ( $attributes['displayType'] ) {
+ case 'range-display':
+ if ( $start === $end ) {
+ $output = sprintf(
+ /* translators: 1: Start index of posts, 2: Total number of posts */
+ __( 'Displaying %1$s of %2$s' ),
+ $start,
+ $max_rows
+ );
+ } else {
+ $output = sprintf(
+ /* translators: 1: Start index of posts, 2: End index of posts, 3: Total number of posts */
+ __( 'Displaying %1$s – %2$s of %3$s' ),
+ $start,
+ $end,
+ $max_rows
+ );
+ }
+
+ break;
+
+ case 'total-results':
+ default:
+ // translators: %d: number of results.
+ $output = sprintf( _n( '%d result found', '%d results found', $max_rows ), $max_rows );
+ break;
+ }
+
+ return sprintf(
+ '%2$s
',
+ $wrapper_attributes,
+ $output
+ );
+}
+
+/**
+ * Registers the `query-total` block.
+ *
+ * @since 6.8.0
+ */
+function register_block_core_query_total() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query-total',
+ array(
+ 'render_callback' => 'render_block_core_query_total',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query_total' );
diff --git a/src/wp-includes/blocks/query-total/block.json b/src/wp-includes/blocks/query-total/block.json
new file mode 100644
index 0000000000000..21f6ba0673903
--- /dev/null
+++ b/src/wp-includes/blocks/query-total/block.json
@@ -0,0 +1,61 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query-total",
+ "title": "Query Total",
+ "category": "theme",
+ "ancestor": [ "core/query" ],
+ "description": "Display the total number of results in a query.",
+ "textdomain": "default",
+ "attributes": {
+ "displayType": {
+ "type": "string",
+ "default": "total-results"
+ }
+ },
+ "usesContext": [ "queryId", "query" ],
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "style": "wp-block-query-total"
+}
diff --git a/src/wp-includes/blocks/query.php b/src/wp-includes/blocks/query.php
new file mode 100644
index 0000000000000..6b544cd99ae8c
--- /dev/null
+++ b/src/wp-includes/blocks/query.php
@@ -0,0 +1,152 @@
+next_tag() ) {
+ // Add the necessary directives.
+ $p->set_attribute( 'data-wp-interactive', 'core/query' );
+ $p->set_attribute( 'data-wp-router-region', 'query-' . $attributes['queryId'] );
+ $p->set_attribute( 'data-wp-context', '{}' );
+ $p->set_attribute( 'data-wp-key', $attributes['queryId'] );
+ $content = $p->get_updated_html();
+ }
+ }
+
+ // Add the styles to the block type if the block is interactive and remove
+ // them if it's not.
+ $style_asset = 'wp-block-query';
+ if ( ! wp_style_is( $style_asset ) ) {
+ $style_handles = $block->block_type->style_handles;
+ // If the styles are not needed, and they are still in the `style_handles`, remove them.
+ if ( ! $is_interactive && in_array( $style_asset, $style_handles, true ) ) {
+ $block->block_type->style_handles = array_diff( $style_handles, array( $style_asset ) );
+ }
+ // If the styles are needed, but they were previously removed, add them again.
+ if ( $is_interactive && ! in_array( $style_asset, $style_handles, true ) ) {
+ $block->block_type->style_handles = array_merge( $style_handles, array( $style_asset ) );
+ }
+ }
+
+ return $content;
+}
+
+/**
+ * Registers the `core/query` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_query() {
+ register_block_type_from_metadata(
+ __DIR__ . '/query',
+ array(
+ 'render_callback' => 'render_block_core_query',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_query' );
+
+/**
+ * Traverse the tree of blocks looking for any plugin block (i.e., a block from
+ * an installed plugin) inside a Query block with the enhanced pagination
+ * enabled. If at least one is found, the enhanced pagination is effectively
+ * disabled to prevent any potential incompatibilities.
+ *
+ * @since 6.4.0
+ *
+ * @param array $parsed_block The block being rendered.
+ * @return array Returns the parsed block, unmodified.
+ */
+function block_core_query_disable_enhanced_pagination( $parsed_block ) {
+ static $enhanced_query_stack = array();
+ static $dirty_enhanced_queries = array();
+ static $render_query_callback = null;
+
+ $block_name = $parsed_block['blockName'];
+ $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+ $has_enhanced_pagination = isset( $parsed_block['attrs']['enhancedPagination'] ) && true === $parsed_block['attrs']['enhancedPagination'] && isset( $parsed_block['attrs']['queryId'] );
+ /*
+ * Client side navigation can be true in two states:
+ * - supports.interactivity = true;
+ * - supports.interactivity.clientNavigation = true;
+ */
+ $supports_client_navigation = ( isset( $block_type->supports['interactivity']['clientNavigation'] ) && true === $block_type->supports['interactivity']['clientNavigation'] )
+ || ( isset( $block_type->supports['interactivity'] ) && true === $block_type->supports['interactivity'] );
+
+ if ( 'core/query' === $block_name && $has_enhanced_pagination ) {
+ $enhanced_query_stack[] = $parsed_block['attrs']['queryId'];
+
+ if ( ! isset( $render_query_callback ) ) {
+ /**
+ * Filter that disables the enhanced pagination feature during block
+ * rendering when a plugin block has been found inside. It does so
+ * by adding an attribute called `data-wp-navigation-disabled` which
+ * is later handled by the front-end logic.
+ *
+ * @param string $content The block content.
+ * @param array $block The full block, including name and attributes.
+ * @return string Returns the modified output of the query block.
+ */
+ $render_query_callback = static function ( $content, $block ) use ( &$enhanced_query_stack, &$dirty_enhanced_queries, &$render_query_callback ) {
+ $has_enhanced_pagination = isset( $block['attrs']['enhancedPagination'] ) && true === $block['attrs']['enhancedPagination'] && isset( $block['attrs']['queryId'] );
+
+ if ( ! $has_enhanced_pagination ) {
+ return $content;
+ }
+
+ if ( isset( $dirty_enhanced_queries[ $block['attrs']['queryId'] ] ) ) {
+ // Disable navigation in the router store config.
+ wp_interactivity_config( 'core/router', array( 'clientNavigationDisabled' => true ) );
+ $dirty_enhanced_queries[ $block['attrs']['queryId'] ] = null;
+ }
+
+ array_pop( $enhanced_query_stack );
+
+ if ( empty( $enhanced_query_stack ) ) {
+ remove_filter( 'render_block_core/query', $render_query_callback );
+ $render_query_callback = null;
+ }
+
+ return $content;
+ };
+
+ add_filter( 'render_block_core/query', $render_query_callback, 10, 2 );
+ }
+ } elseif (
+ ! empty( $enhanced_query_stack ) &&
+ isset( $block_name ) &&
+ ( ! $supports_client_navigation )
+ ) {
+ foreach ( $enhanced_query_stack as $query_id ) {
+ $dirty_enhanced_queries[ $query_id ] = true;
+ }
+ }
+
+ return $parsed_block;
+}
+
+add_filter( 'render_block_data', 'block_core_query_disable_enhanced_pagination', 10, 1 );
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
new file mode 100644
index 0000000000000..33ba8bfd925ca
--- /dev/null
+++ b/src/wp-includes/blocks/query/block.json
@@ -0,0 +1,60 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/query",
+ "title": "Query Loop",
+ "category": "theme",
+ "description": "An advanced block that allows displaying post types based on different query parameters and visual configurations.",
+ "keywords": [ "posts", "list", "blog", "blogs", "custom post types" ],
+ "textdomain": "default",
+ "attributes": {
+ "queryId": {
+ "type": "number"
+ },
+ "query": {
+ "type": "object",
+ "default": {
+ "perPage": null,
+ "pages": 0,
+ "offset": 0,
+ "postType": "post",
+ "order": "desc",
+ "orderBy": "date",
+ "author": "",
+ "search": "",
+ "exclude": [],
+ "sticky": "",
+ "inherit": true,
+ "taxQuery": null,
+ "parents": [],
+ "format": []
+ }
+ },
+ "tagName": {
+ "type": "string",
+ "default": "div"
+ },
+ "namespace": {
+ "type": "string"
+ },
+ "enhancedPagination": {
+ "type": "boolean",
+ "default": false
+ }
+ },
+ "usesContext": [ "templateSlug" ],
+ "providesContext": {
+ "queryId": "queryId",
+ "query": "query",
+ "displayLayout": "displayLayout",
+ "enhancedPagination": "enhancedPagination"
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "layout": true,
+ "interactivity": true,
+ "contentRole": true
+ },
+ "editorStyle": "wp-block-query-editor"
+}
diff --git a/src/wp-includes/blocks/quote/block.json b/src/wp-includes/blocks/quote/block.json
new file mode 100644
index 0000000000000..52609ee57d12a
--- /dev/null
+++ b/src/wp-includes/blocks/quote/block.json
@@ -0,0 +1,105 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/quote",
+ "title": "Quote",
+ "category": "text",
+ "description": "Give quoted text visual emphasis. \"In quoting others, we cite ourselves.\" — Julio Cortázar",
+ "keywords": [ "blockquote", "cite" ],
+ "textdomain": "default",
+ "attributes": {
+ "value": {
+ "type": "string",
+ "source": "html",
+ "selector": "blockquote",
+ "multiline": "p",
+ "default": "",
+ "role": "content"
+ },
+ "citation": {
+ "type": "rich-text",
+ "source": "rich-text",
+ "selector": "cite",
+ "role": "content"
+ },
+ "textAlign": {
+ "type": "string"
+ }
+ },
+ "supports": {
+ "anchor": true,
+ "align": [ "left", "right", "wide", "full" ],
+ "html": false,
+ "background": {
+ "backgroundImage": true,
+ "backgroundSize": true,
+ "__experimentalDefaultControls": {
+ "backgroundImage": true
+ }
+ },
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true
+ }
+ },
+ "dimensions": {
+ "minHeight": true,
+ "__experimentalDefaultControls": {
+ "minHeight": false
+ }
+ },
+ "__experimentalOnEnter": true,
+ "__experimentalOnMerge": true,
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "color": {
+ "gradients": true,
+ "heading": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "layout": {
+ "allowEditing": false
+ },
+ "spacing": {
+ "blockGap": true,
+ "padding": true,
+ "margin": true
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "allowedBlocks": true
+ },
+ "styles": [
+ {
+ "name": "default",
+ "label": "Default",
+ "isDefault": true
+ },
+ { "name": "plain", "label": "Plain" }
+ ],
+ "editorStyle": "wp-block-quote-editor",
+ "style": "wp-block-quote"
+}
diff --git a/src/wp-includes/blocks/read-more.php b/src/wp-includes/blocks/read-more.php
new file mode 100644
index 0000000000000..c01a0a377fc93
--- /dev/null
+++ b/src/wp-includes/blocks/read-more.php
@@ -0,0 +1,63 @@
+context['postId'] ) ) {
+ return '';
+ }
+
+ $post_ID = $block->context['postId'];
+ $post_title = get_the_title( $post_ID );
+ if ( '' === $post_title ) {
+ $post_title = sprintf(
+ /* translators: %s is post ID to describe the link for screen readers. */
+ __( 'untitled post %s' ),
+ $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
+ );
+ $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%5s',
+ $wrapper_attributes,
+ get_the_permalink( $post_ID ),
+ esc_attr( $attributes['linkTarget'] ),
+ $more_text,
+ $screen_reader_text
+ );
+}
+
+/**
+ * Registers the `core/read-more` block on the server.
+ *
+ * @since 6.0.0
+ */
+function register_block_core_read_more() {
+ register_block_type_from_metadata(
+ __DIR__ . '/read-more',
+ array(
+ 'render_callback' => 'render_block_core_read_more',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_read_more' );
diff --git a/src/wp-includes/blocks/read-more/block.json b/src/wp-includes/blocks/read-more/block.json
new file mode 100644
index 0000000000000..eabc7acf3e3a3
--- /dev/null
+++ b/src/wp-includes/blocks/read-more/block.json
@@ -0,0 +1,60 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/read-more",
+ "title": "Read More",
+ "category": "theme",
+ "description": "Displays the link of a post, page, or any other content-type.",
+ "textdomain": "default",
+ "attributes": {
+ "content": {
+ "type": "string",
+ "role": "content"
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self"
+ }
+ },
+ "usesContext": [ "postId" ],
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "text": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true,
+ "textDecoration": true
+ }
+ },
+ "spacing": {
+ "margin": [ "top", "bottom" ],
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "padding": true
+ }
+ },
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "width": true,
+ "__experimentalDefaultControls": {
+ "width": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "style": "wp-block-read-more"
+}
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
new file mode 100644
index 0000000000000..48fa6cb90b9c8
--- /dev/null
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -0,0 +1,85 @@
+' . __( 'Adding an RSS feed to this site’s homepage is not supported, as it could lead to a loop that slows down your site. Try using another block, like the Latest Posts block, to list posts from the site.' ) . '
';
+ }
+
+ $rss = fetch_feed( $attributes['feedURL'] );
+
+ if ( is_wp_error( $rss ) ) {
+ return '' . __( 'RSS Error:' ) . ' ' . esc_html( $rss->get_error_message() ) . '
' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '
{$title}
";
+
+ $date_markup = '';
+ if ( ! empty( $attributes['displayDate'] ) ) {
+ $timestamp = $item->get_date( 'U' );
+
+ if ( $timestamp ) {
+ $gmt_offset = get_option( 'gmt_offset' );
+ $timestamp += (int) ( (float) $gmt_offset * HOUR_IN_SECONDS );
+
+ $date_markup = sprintf(
+ ' ',
+ esc_attr( date_i18n( 'c', $timestamp ) ),
+ esc_html( date_i18n( get_option( 'date_format' ), $timestamp ) )
+ );
+ }
+ }
+
+ $author = '';
+ if ( $attributes['displayAuthor'] ) {
+ $author = $item->get_author();
+ if ( is_object( $author ) ) {
+ $author = $author->get_name();
+ if ( ! empty( $author ) ) {
+ $author = '';
+ }
+ }
+ }
+
+ $excerpt = '';
+ $description = $item->get_description();
+ if ( $attributes['displayExcerpt'] && ! empty( $description ) ) {
+ $excerpt = html_entity_decode( $description, ENT_QUOTES, get_option( 'blog_charset' ) );
+ $excerpt = esc_attr( wp_trim_words( $excerpt, $attributes['excerptLength'], ' […]' ) );
+
+ // Change existing [...] to […].
+ if ( '[...]' === substr( $excerpt, -5 ) ) {
+ $excerpt = substr( $excerpt, 0, -5 ) . '[…]';
+ }
+
+ $excerpt = '' . esc_html( $excerpt ) . '
';
+ }
+
+ $list_items .= "- %s
%s
',
+ esc_attr( implode( ' ', $field_markup_classes ) ),
+ $inline_styles['wrapper'],
+ $input . $query_params_markup . $button
+ );
+ $wrapper_attributes = get_block_wrapper_attributes(
+ array( 'class' => $classnames )
+ );
+ $form_directives = '';
+
+ // If it's interactive, add the directives.
+ if ( $is_expandable_searchfield ) {
+ $aria_label_expanded = __( 'Submit Search' );
+ $aria_label_collapsed = __( 'Expand search field' );
+ $form_context = wp_interactivity_data_wp_context(
+ array(
+ 'isSearchInputVisible' => $open_by_default,
+ 'inputId' => $input_id,
+ 'ariaLabelExpanded' => $aria_label_expanded,
+ 'ariaLabelCollapsed' => $aria_label_collapsed,
+ )
+ );
+ $form_directives = '
+ data-wp-interactive="core/search"
+ ' . $form_context . '
+ data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
+ data-wp-on--keydown="actions.handleSearchKeydown"
+ data-wp-on--focusout="actions.handleSearchFocusout"
+ ';
+ }
+
+ return sprintf(
+ '',
+ esc_url( home_url( '/' ) ),
+ $wrapper_attributes,
+ $form_directives,
+ $label . $field_markup
+ );
+}
+
+/**
+ * Registers the `core/search` block on the server.
+ *
+ * @since 5.2.0
+ */
+function register_block_core_search() {
+ register_block_type_from_metadata(
+ __DIR__ . '/search',
+ array(
+ 'render_callback' => 'render_block_core_search',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_search' );
+
+/**
+ * Builds the correct top level classnames for the 'core/search' block.
+ *
+ * @since 5.6.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string The classnames used in the block.
+ */
+function classnames_for_block_core_search( $attributes ) {
+ $classnames = array();
+
+ if ( ! empty( $attributes['buttonPosition'] ) ) {
+ if ( 'button-inside' === $attributes['buttonPosition'] ) {
+ $classnames[] = 'wp-block-search__button-inside';
+ }
+
+ if ( 'button-outside' === $attributes['buttonPosition'] ) {
+ $classnames[] = 'wp-block-search__button-outside';
+ }
+
+ if ( 'no-button' === $attributes['buttonPosition'] ) {
+ $classnames[] = 'wp-block-search__no-button';
+ }
+
+ if ( 'button-only' === $attributes['buttonPosition'] ) {
+ $classnames[] = 'wp-block-search__button-only wp-block-search__searchfield-hidden';
+ }
+ }
+
+ if ( isset( $attributes['buttonUseIcon'] ) ) {
+ if ( ! empty( $attributes['buttonPosition'] ) && 'no-button' !== $attributes['buttonPosition'] ) {
+ if ( $attributes['buttonUseIcon'] ) {
+ $classnames[] = 'wp-block-search__icon-button';
+ } else {
+ $classnames[] = 'wp-block-search__text-button';
+ }
+ }
+ }
+
+ return implode( ' ', $classnames );
+}
+
+/**
+ * This generates a CSS rule for the given border property and side if provided.
+ * Based on whether the Search block is configured to display the button inside
+ * or not, the generated rule is injected into the appropriate collection of
+ * styles for later application in the block's markup.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ * @param string $property Border property to generate rule for e.g. width or color.
+ * @param string $side Optional side border. The dictates the value retrieved and final CSS property.
+ * @param array $wrapper_styles Current collection of wrapper styles.
+ * @param array $button_styles Current collection of button styles.
+ * @param array $input_styles Current collection of input styles.
+ */
+function apply_block_core_search_border_style( $attributes, $property, $side, &$wrapper_styles, &$button_styles, &$input_styles ) {
+ $is_button_inside = isset( $attributes['buttonPosition'] ) && 'button-inside' === $attributes['buttonPosition'];
+
+ $path = array( 'style', 'border', $property );
+
+ if ( $side ) {
+ array_splice( $path, 2, 0, $side );
+ }
+
+ $value = _wp_array_get( $attributes, $path, false );
+
+ if ( empty( $value ) ) {
+ return;
+ }
+
+ if ( 'color' === $property && $side ) {
+ $has_color_preset = str_contains( $value, 'var:preset|color|' );
+ if ( $has_color_preset ) {
+ $named_color_value = substr( $value, strrpos( $value, '|' ) + 1 );
+ $value = sprintf( 'var(--wp--preset--color--%s)', $named_color_value );
+ }
+ }
+
+ $property_suffix = $side ? sprintf( '%s-%s', $side, $property ) : $property;
+
+ if ( $is_button_inside ) {
+ $wrapper_styles[] = sprintf( 'border-%s: %s;', $property_suffix, esc_attr( $value ) );
+ } else {
+ $button_styles[] = sprintf( 'border-%s: %s;', $property_suffix, esc_attr( $value ) );
+ $input_styles[] = sprintf( 'border-%s: %s;', $property_suffix, esc_attr( $value ) );
+ }
+}
+
+/**
+ * This adds CSS rules for a given border property e.g. width or color. It
+ * injects rules into the provided wrapper, button and input style arrays for
+ * uniform "flat" borders or those with individual sides configured.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ * @param string $property Border property to generate rule for e.g. width or color.
+ * @param array $wrapper_styles Current collection of wrapper styles.
+ * @param array $button_styles Current collection of button styles.
+ * @param array $input_styles Current collection of input styles.
+ */
+function apply_block_core_search_border_styles( $attributes, $property, &$wrapper_styles, &$button_styles, &$input_styles ) {
+ apply_block_core_search_border_style( $attributes, $property, null, $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'top', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'right', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'bottom', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'left', $wrapper_styles, $button_styles, $input_styles );
+}
+
+/**
+ * Builds an array of inline styles for the search block.
+ *
+ * The result will contain one entry for shared styles such as those for the
+ * inner input or button and a second for the inner wrapper should the block
+ * be positioning the button "inside".
+ *
+ * @since 5.8.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return array Style HTML attribute.
+ */
+function styles_for_block_core_search( $attributes ) {
+ $wrapper_styles = array();
+ $button_styles = array();
+ $input_styles = array();
+ $label_styles = array();
+ $is_button_inside = ! empty( $attributes['buttonPosition'] ) &&
+ 'button-inside' === $attributes['buttonPosition'];
+ $show_label = ( isset( $attributes['showLabel'] ) ) && false !== $attributes['showLabel'];
+
+ // Add width styles.
+ $has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
+
+ if ( $has_width ) {
+ $wrapper_styles[] = sprintf(
+ 'width: %d%s;',
+ esc_attr( $attributes['width'] ),
+ esc_attr( $attributes['widthUnit'] )
+ );
+ }
+
+ // Add border width and color styles.
+ apply_block_core_search_border_styles( $attributes, 'width', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_styles( $attributes, 'color', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_styles( $attributes, 'style', $wrapper_styles, $button_styles, $input_styles );
+
+ // Add border radius styles.
+ $has_border_radius = ! empty( $attributes['style']['border']['radius'] );
+
+ if ( $has_border_radius ) {
+ $default_padding = '4px';
+ $border_radius = $attributes['style']['border']['radius'];
+
+ if ( is_array( $border_radius ) ) {
+ // Apply styles for individual corner border radii.
+ foreach ( $border_radius as $key => $value ) {
+ // Get border-radius CSS variable from preset value if provided.
+ if ( is_string( $value ) && str_contains( $value, 'var:preset|border-radius|' ) ) {
+ $index_to_splice = strrpos( $value, '|' ) + 1;
+ $slug = _wp_to_kebab_case( substr( $value, $index_to_splice ) );
+ $value = "var(--wp--preset--border-radius--$slug)";
+ }
+
+ if ( null !== $value ) {
+ // Convert camelCase key to kebab-case.
+ $name = strtolower( preg_replace( '/(? ! empty( $input_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $input_styles ) ) ) ) : '',
+ 'button' => ! empty( $button_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $button_styles ) ) ) ) : '',
+ 'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) ) : '',
+ 'label' => ! empty( $label_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $label_styles ) ) ) ) : '',
+ );
+}
+
+/**
+ * Returns typography classnames depending on whether there are named font sizes/families.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string The typography color classnames to be applied to the block elements.
+ */
+function get_typography_classes_for_block_core_search( $attributes ) {
+ $typography_classes = array();
+ $has_named_font_family = ! empty( $attributes['fontFamily'] );
+ $has_named_font_size = ! empty( $attributes['fontSize'] );
+
+ if ( $has_named_font_size ) {
+ $typography_classes[] = sprintf( 'has-%s-font-size', esc_attr( $attributes['fontSize'] ) );
+ }
+
+ if ( $has_named_font_family ) {
+ $typography_classes[] = sprintf( 'has-%s-font-family', esc_attr( $attributes['fontFamily'] ) );
+ }
+
+ return implode( ' ', $typography_classes );
+}
+
+/**
+ * Returns typography styles to be included in an HTML style tag.
+ * This excludes text-decoration, which is applied only to the label and button elements of the search block.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string A string of typography CSS declarations.
+ */
+function get_typography_styles_for_block_core_search( $attributes ) {
+ $typography_styles = array();
+
+ // Add typography styles.
+ if ( ! empty( $attributes['style']['typography']['fontSize'] ) ) {
+ $typography_styles[] = sprintf(
+ 'font-size: %s;',
+ wp_get_typography_font_size_value(
+ array(
+ 'size' => $attributes['style']['typography']['fontSize'],
+ )
+ )
+ );
+
+ }
+
+ if ( ! empty( $attributes['style']['typography']['fontFamily'] ) ) {
+ $typography_styles[] = sprintf( 'font-family: %s;', $attributes['style']['typography']['fontFamily'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['letterSpacing'] ) ) {
+ $typography_styles[] = sprintf( 'letter-spacing: %s;', $attributes['style']['typography']['letterSpacing'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['fontWeight'] ) ) {
+ $typography_styles[] = sprintf( 'font-weight: %s;', $attributes['style']['typography']['fontWeight'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['fontStyle'] ) ) {
+ $typography_styles[] = sprintf( 'font-style: %s;', $attributes['style']['typography']['fontStyle'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['lineHeight'] ) ) {
+ $typography_styles[] = sprintf( 'line-height: %s;', $attributes['style']['typography']['lineHeight'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['textTransform'] ) ) {
+ $typography_styles[] = sprintf( 'text-transform: %s;', $attributes['style']['typography']['textTransform'] );
+ }
+
+ return implode( '', $typography_styles );
+}
+
+/**
+ * Returns border color classnames depending on whether there are named or custom border colors.
+ *
+ * @since 5.9.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string The border color classnames to be applied to the block elements.
+ */
+function get_border_color_classes_for_block_core_search( $attributes ) {
+ $border_color_classes = array();
+ $has_custom_border_color = ! empty( $attributes['style']['border']['color'] );
+ $has_named_border_color = ! empty( $attributes['borderColor'] );
+
+ if ( $has_custom_border_color || $has_named_border_color ) {
+ $border_color_classes[] = 'has-border-color';
+ }
+
+ if ( $has_named_border_color ) {
+ $border_color_classes[] = sprintf( 'has-%s-border-color', esc_attr( $attributes['borderColor'] ) );
+ }
+
+ return implode( ' ', $border_color_classes );
+}
+
+/**
+ * Returns color classnames depending on whether there are named or custom text and background colors.
+ *
+ * @since 5.9.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string The color classnames to be applied to the block elements.
+ */
+function get_color_classes_for_block_core_search( $attributes ) {
+ $classnames = array();
+
+ // Text color.
+ $has_named_text_color = ! empty( $attributes['textColor'] );
+ $has_custom_text_color = ! empty( $attributes['style']['color']['text'] );
+ if ( $has_named_text_color ) {
+ $classnames[] = sprintf( 'has-text-color has-%s-color', $attributes['textColor'] );
+ } elseif ( $has_custom_text_color ) {
+ // If a custom 'textColor' was selected instead of a preset, still add the generic `has-text-color` class.
+ $classnames[] = 'has-text-color';
+ }
+
+ // Background color.
+ $has_named_background_color = ! empty( $attributes['backgroundColor'] );
+ $has_custom_background_color = ! empty( $attributes['style']['color']['background'] );
+ $has_named_gradient = ! empty( $attributes['gradient'] );
+ $has_custom_gradient = ! empty( $attributes['style']['color']['gradient'] );
+ if (
+ $has_named_background_color ||
+ $has_custom_background_color ||
+ $has_named_gradient ||
+ $has_custom_gradient
+ ) {
+ $classnames[] = 'has-background';
+ }
+ if ( $has_named_background_color ) {
+ $classnames[] = sprintf( 'has-%s-background-color', $attributes['backgroundColor'] );
+ }
+ if ( $has_named_gradient ) {
+ $classnames[] = sprintf( 'has-%s-gradient-background', $attributes['gradient'] );
+ }
+
+ return implode( ' ', $classnames );
+}
diff --git a/src/wp-includes/blocks/search/block.json b/src/wp-includes/blocks/search/block.json
new file mode 100644
index 0000000000000..c5af5a29d21be
--- /dev/null
+++ b/src/wp-includes/blocks/search/block.json
@@ -0,0 +1,95 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/search",
+ "title": "Search",
+ "category": "widgets",
+ "description": "Help visitors find your content.",
+ "keywords": [ "find" ],
+ "textdomain": "default",
+ "attributes": {
+ "label": {
+ "type": "string",
+ "role": "content"
+ },
+ "showLabel": {
+ "type": "boolean",
+ "default": true
+ },
+ "placeholder": {
+ "type": "string",
+ "default": "",
+ "role": "content"
+ },
+ "width": {
+ "type": "number"
+ },
+ "widthUnit": {
+ "type": "string"
+ },
+ "buttonText": {
+ "type": "string",
+ "role": "content"
+ },
+ "buttonPosition": {
+ "type": "string",
+ "default": "button-outside"
+ },
+ "buttonUseIcon": {
+ "type": "boolean",
+ "default": false
+ },
+ "query": {
+ "type": "object",
+ "default": {}
+ },
+ "isSearchFieldHidden": {
+ "type": "boolean",
+ "default": false
+ }
+ },
+ "supports": {
+ "align": [ "left", "center", "right" ],
+ "color": {
+ "gradients": true,
+ "__experimentalSkipSerialization": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "interactivity": true,
+ "typography": {
+ "__experimentalSkipSerialization": true,
+ "__experimentalSelector": ".wp-block-search__label, .wp-block-search__input, .wp-block-search__button",
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "width": true,
+ "__experimentalSkipSerialization": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "width": true
+ }
+ },
+ "spacing": {
+ "margin": true
+ },
+ "html": false
+ },
+ "editorStyle": "wp-block-search-editor",
+ "style": "wp-block-search"
+}
diff --git a/src/wp-includes/blocks/separator/block.json b/src/wp-includes/blocks/separator/block.json
new file mode 100644
index 0000000000000..926d978b7e4d5
--- /dev/null
+++ b/src/wp-includes/blocks/separator/block.json
@@ -0,0 +1,48 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/separator",
+ "title": "Separator",
+ "category": "design",
+ "description": "Create a break between ideas or sections with a horizontal separator.",
+ "keywords": [ "horizontal-line", "hr", "divider" ],
+ "textdomain": "default",
+ "attributes": {
+ "opacity": {
+ "type": "string",
+ "default": "alpha-channel"
+ },
+ "tagName": {
+ "type": "string",
+ "enum": [ "hr", "div" ],
+ "default": "hr"
+ }
+ },
+ "supports": {
+ "anchor": true,
+ "align": [ "center", "wide", "full" ],
+ "color": {
+ "enableContrastChecker": false,
+ "__experimentalSkipSerialization": true,
+ "gradients": true,
+ "background": true,
+ "text": false,
+ "__experimentalDefaultControls": {
+ "background": true
+ }
+ },
+ "spacing": {
+ "margin": [ "top", "bottom" ]
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "styles": [
+ { "name": "default", "label": "Default", "isDefault": true },
+ { "name": "wide", "label": "Wide Line" },
+ { "name": "dots", "label": "Dots" }
+ ],
+ "editorStyle": "wp-block-separator-editor",
+ "style": "wp-block-separator"
+}
diff --git a/src/wp-includes/blocks/shortcode.php b/src/wp-includes/blocks/shortcode.php
new file mode 100644
index 0000000000000..d96acfc55fa64
--- /dev/null
+++ b/src/wp-includes/blocks/shortcode.php
@@ -0,0 +1,35 @@
+ 'render_block_core_shortcode',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_shortcode' );
diff --git a/src/wp-includes/blocks/shortcode/block.json b/src/wp-includes/blocks/shortcode/block.json
new file mode 100644
index 0000000000000..6e30210b7c081
--- /dev/null
+++ b/src/wp-includes/blocks/shortcode/block.json
@@ -0,0 +1,22 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/shortcode",
+ "title": "Shortcode",
+ "category": "widgets",
+ "description": "Insert additional custom elements with a WordPress shortcode.",
+ "textdomain": "default",
+ "attributes": {
+ "text": {
+ "type": "string",
+ "source": "raw",
+ "role": "content"
+ }
+ },
+ "supports": {
+ "className": false,
+ "customClassName": false,
+ "html": false
+ },
+ "editorStyle": "wp-block-shortcode-editor"
+}
diff --git a/src/wp-includes/blocks/site-logo.php b/src/wp-includes/blocks/site-logo.php
new file mode 100644
index 0000000000000..915563461e30c
--- /dev/null
+++ b/src/wp-includes/blocks/site-logo.php
@@ -0,0 +1,234 @@
+(.*?)#i', '\1', $custom_logo );
+ }
+
+ if ( $attributes['isLink'] && '_blank' === $attributes['linkTarget'] ) {
+ // Add the link target after the rel="home".
+ // Add an aria-label for informing that the page opens in a new tab.
+ $processor = new WP_HTML_Tag_Processor( $custom_logo );
+ $processor->next_tag( 'a' );
+ if ( 'home' === $processor->get_attribute( 'rel' ) ) {
+ $processor->set_attribute( 'aria-label', __( '(Home link, opens in a new tab)' ) );
+ $processor->set_attribute( 'target', $attributes['linkTarget'] );
+ }
+ $custom_logo = $processor->get_updated_html();
+ }
+
+ $classnames = array();
+ if ( empty( $attributes['width'] ) ) {
+ $classnames[] = 'is-default-size';
+ }
+
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classnames ) ) );
+ $html = sprintf( '%s
', $wrapper_attributes, $custom_logo );
+ return $html;
+}
+
+/**
+ * Register a core site setting for a site logo
+ *
+ * @since 5.8.0
+ */
+function register_block_core_site_logo_setting() {
+ register_setting(
+ 'general',
+ 'site_logo',
+ array(
+ 'show_in_rest' => array(
+ 'name' => 'site_logo',
+ ),
+ 'type' => 'integer',
+ 'label' => __( 'Logo' ),
+ 'description' => __( 'Site logo.' ),
+ )
+ );
+}
+
+add_action( 'rest_api_init', 'register_block_core_site_logo_setting', 10 );
+
+/**
+ * Register a core site setting for a site icon
+ *
+ * @since 5.9.0
+ */
+function register_block_core_site_icon_setting() {
+ register_setting(
+ 'general',
+ 'site_icon',
+ array(
+ 'show_in_rest' => true,
+ 'type' => 'integer',
+ 'label' => __( 'Icon' ),
+ 'description' => __( 'Site icon.' ),
+ )
+ );
+}
+
+add_action( 'rest_api_init', 'register_block_core_site_icon_setting', 10 );
+
+/**
+ * Registers the `core/site-logo` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_site_logo() {
+ register_block_type_from_metadata(
+ __DIR__ . '/site-logo',
+ array(
+ 'render_callback' => 'render_block_core_site_logo',
+ )
+ );
+}
+
+add_action( 'init', 'register_block_core_site_logo' );
+
+/**
+ * Overrides the custom logo with a site logo, if the option is set.
+ *
+ * @since 5.8.0
+ *
+ * @param string $custom_logo The custom logo set by a theme.
+ *
+ * @return string The site logo if set.
+ */
+function _override_custom_logo_theme_mod( $custom_logo ) {
+ $site_logo = get_option( 'site_logo' );
+ return false === $site_logo ? $custom_logo : $site_logo;
+}
+
+add_filter( 'theme_mod_custom_logo', '_override_custom_logo_theme_mod' );
+
+/**
+ * Updates the site_logo option when the custom_logo theme-mod gets updated.
+ *
+ * @since 5.8.0
+ *
+ * @param mixed $value Attachment ID of the custom logo or an empty value.
+ * @return mixed
+ */
+function _sync_custom_logo_to_site_logo( $value ) {
+ if ( empty( $value ) ) {
+ delete_option( 'site_logo' );
+ } else {
+ update_option( 'site_logo', $value );
+ }
+
+ return $value;
+}
+
+add_filter( 'pre_set_theme_mod_custom_logo', '_sync_custom_logo_to_site_logo' );
+
+/**
+ * Deletes the site_logo when the custom_logo theme mod is removed.
+ *
+ * @since 5.8.0
+ *
+ * @global array $_ignore_site_logo_changes
+ *
+ * @param array $old_value Previous theme mod settings.
+ * @param array $value Updated theme mod settings.
+ */
+function _delete_site_logo_on_remove_custom_logo( $old_value, $value ) {
+ global $_ignore_site_logo_changes;
+
+ if ( $_ignore_site_logo_changes ) {
+ return;
+ }
+
+ // If the custom_logo is being unset, it's being removed from theme mods.
+ if ( isset( $old_value['custom_logo'] ) && ! isset( $value['custom_logo'] ) ) {
+ delete_option( 'site_logo' );
+ }
+}
+
+/**
+ * Deletes the site logo when all theme mods are being removed.
+ *
+ * @since 5.8.0
+ *
+ * @global array $_ignore_site_logo_changes
+ */
+function _delete_site_logo_on_remove_theme_mods() {
+ global $_ignore_site_logo_changes;
+
+ if ( $_ignore_site_logo_changes ) {
+ return;
+ }
+
+ if ( false !== get_theme_support( 'custom-logo' ) ) {
+ delete_option( 'site_logo' );
+ }
+}
+
+/**
+ * Hooks `_delete_site_logo_on_remove_custom_logo` in `update_option_theme_mods_$theme`.
+ * Hooks `_delete_site_logo_on_remove_theme_mods` in `delete_option_theme_mods_$theme`.
+ *
+ * Runs on `setup_theme` to account for dynamically-switched themes in the Customizer.
+ *
+ * @since 5.8.0
+ */
+function _delete_site_logo_on_remove_custom_logo_on_setup_theme() {
+ $theme = get_option( 'stylesheet' );
+ add_action( "update_option_theme_mods_$theme", '_delete_site_logo_on_remove_custom_logo', 10, 2 );
+ add_action( "delete_option_theme_mods_$theme", '_delete_site_logo_on_remove_theme_mods' );
+}
+add_action( 'setup_theme', '_delete_site_logo_on_remove_custom_logo_on_setup_theme', 11 );
+
+/**
+ * Removes the custom_logo theme-mod when the site_logo option gets deleted.
+ *
+ * @since 5.9.0
+ *
+ * @global array $_ignore_site_logo_changes
+ */
+function _delete_custom_logo_on_remove_site_logo() {
+ global $_ignore_site_logo_changes;
+
+ // Prevent _delete_site_logo_on_remove_custom_logo and
+ // _delete_site_logo_on_remove_theme_mods from firing and causing an
+ // infinite loop.
+ $_ignore_site_logo_changes = true;
+
+ // Remove the custom logo.
+ remove_theme_mod( 'custom_logo' );
+
+ $_ignore_site_logo_changes = false;
+}
+add_action( 'delete_option_site_logo', '_delete_custom_logo_on_remove_site_logo' );
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
new file mode 100644
index 0000000000000..b49588d3716fa
--- /dev/null
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -0,0 +1,72 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/site-logo",
+ "title": "Site Logo",
+ "category": "theme",
+ "description": "Display an image to represent this site. Update this block and the changes apply everywhere.",
+ "textdomain": "default",
+ "attributes": {
+ "width": {
+ "type": "number"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": true,
+ "role": "content"
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self",
+ "role": "content"
+ },
+ "shouldSyncIcon": {
+ "type": "boolean"
+ }
+ },
+ "example": {
+ "viewportWidth": 500,
+ "attributes": {
+ "width": 350,
+ "className": "block-editor-block-types-list__site-logo-example"
+ }
+ },
+ "supports": {
+ "html": false,
+ "align": true,
+ "alignWide": false,
+ "color": {
+ "text": false,
+ "background": false
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "filter": {
+ "duotone": true
+ }
+ },
+ "styles": [
+ {
+ "name": "default",
+ "label": "Default",
+ "isDefault": true
+ },
+ { "name": "rounded", "label": "Rounded" }
+ ],
+ "selectors": {
+ "filter": {
+ "duotone": ".wp-block-site-logo img, .wp-block-site-logo .components-placeholder__illustration, .wp-block-site-logo .components-placeholder::before"
+ }
+ },
+ "editorStyle": "wp-block-site-logo-editor",
+ "style": "wp-block-site-logo"
+}
diff --git a/src/wp-includes/blocks/site-tagline.php b/src/wp-includes/blocks/site-tagline.php
new file mode 100644
index 0000000000000..b59e1e556c320
--- /dev/null
+++ b/src/wp-includes/blocks/site-tagline.php
@@ -0,0 +1,53 @@
+ $align_class_name ) );
+
+ if ( isset( $attributes['level'] ) && 0 !== $attributes['level'] ) {
+ $tag_name = 'h' . (int) $attributes['level'];
+ }
+
+ return sprintf(
+ '<%1$s %2$s>%3$s',
+ $tag_name,
+ $wrapper_attributes,
+ $site_tagline
+ );
+}
+
+/**
+ * Registers the `core/site-tagline` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_site_tagline() {
+ register_block_type_from_metadata(
+ __DIR__ . '/site-tagline',
+ array(
+ 'render_callback' => 'render_block_core_site_tagline',
+ )
+ );
+}
+
+add_action( 'init', 'register_block_core_site_tagline' );
diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json
new file mode 100644
index 0000000000000..7f94d962e9cbc
--- /dev/null
+++ b/src/wp-includes/blocks/site-tagline/block.json
@@ -0,0 +1,74 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/site-tagline",
+ "title": "Site Tagline",
+ "category": "theme",
+ "description": "Describe in a few words what this site is about. This is important for search results, sharing on social media, and gives overall clarity to visitors.",
+ "keywords": [ "description" ],
+ "textdomain": "default",
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "level": {
+ "type": "number",
+ "default": 0
+ },
+ "levelOptions": {
+ "type": "array",
+ "default": [ 0, 1, 2, 3, 4, 5, 6 ]
+ }
+ },
+ "example": {
+ "viewportWidth": 350,
+ "attributes": {
+ "textAlign": "center"
+ }
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "contentRole": true,
+ "spacing": {
+ "margin": true,
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalFontStyle": true,
+ "__experimentalFontWeight": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalWritingMode": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ },
+ "editorStyle": "wp-block-site-tagline-editor",
+ "style": "wp-block-site-tagline"
+}
diff --git a/src/wp-includes/blocks/site-title.php b/src/wp-includes/blocks/site-title.php
new file mode 100644
index 0000000000000..297d99894e104
--- /dev/null
+++ b/src/wp-includes/blocks/site-title.php
@@ -0,0 +1,69 @@
+%4$s',
+ esc_url( home_url() ),
+ esc_attr( $link_target ),
+ $aria_current,
+ esc_html( $site_title )
+ );
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classes ) ) );
+
+ return sprintf(
+ '<%1$s %2$s>%3$s',
+ $tag_name,
+ $wrapper_attributes,
+ // already pre-escaped if it is a link.
+ $attributes['isLink'] ? $site_title : esc_html( $site_title )
+ );
+}
+
+/**
+ * Registers the `core/site-title` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_site_title() {
+ register_block_type_from_metadata(
+ __DIR__ . '/site-title',
+ array(
+ 'render_callback' => 'render_block_core_site_title',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_site_title' );
diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json
new file mode 100644
index 0000000000000..8edf6b945f9ce
--- /dev/null
+++ b/src/wp-includes/blocks/site-title/block.json
@@ -0,0 +1,81 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/site-title",
+ "title": "Site Title",
+ "category": "theme",
+ "description": "Displays the name of this site. Update the block, and the changes apply everywhere it’s used. This will also appear in the browser title bar and in search results.",
+ "textdomain": "default",
+ "attributes": {
+ "level": {
+ "type": "number",
+ "default": 1
+ },
+ "levelOptions": {
+ "type": "array",
+ "default": [ 0, 1, 2, 3, 4, 5, 6 ]
+ },
+ "textAlign": {
+ "type": "string"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": true,
+ "role": "content"
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self",
+ "role": "content"
+ }
+ },
+ "example": {
+ "viewportWidth": 500
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "spacing": {
+ "padding": true,
+ "margin": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalFontStyle": true,
+ "__experimentalFontWeight": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalWritingMode": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ },
+ "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
new file mode 100644
index 0000000000000..3673504bc9396
--- /dev/null
+++ b/src/wp-includes/blocks/social-link.php
@@ -0,0 +1,408 @@
+context['openInNewTab'] ) ? $block->context['openInNewTab'] : false;
+
+ $text = ! empty( $attributes['label'] ) ? trim( $attributes['label'] ) : '';
+
+ $service = isset( $attributes['service'] ) ? $attributes['service'] : 'Icon';
+ $url = isset( $attributes['url'] ) ? $attributes['url'] : false;
+ $text = $text ? $text : 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.
+ if ( ! $url ) {
+ return '';
+ }
+
+ /**
+ * Prepend emails with `mailto:` if not set.
+ * The `is_email` returns false for emails with schema.
+ */
+ if ( is_email( $url ) ) {
+ $url = 'mailto:' . antispambot( $url );
+ }
+
+ /**
+ * Prepend URL with https:// if it doesn't appear to contain a scheme
+ * and it's not a relative link or a fragment.
+ */
+ if ( ! parse_url( $url, PHP_URL_SCHEME ) && ! str_starts_with( $url, '//' ) && ! str_starts_with( $url, '#' ) ) {
+ $url = 'https://' . $url;
+ }
+
+ $icon = block_core_social_link_get_icon( $service );
+ $wrapper_attributes = get_block_wrapper_attributes(
+ array(
+ 'class' => 'wp-social-link wp-social-link-' . $service . block_core_social_link_get_color_classes( $block->context ),
+ 'style' => block_core_social_link_get_color_styles( $block->context ),
+ )
+ );
+
+ $link = '%2$s
', + $wrapper_attributes, + $tag_cloud + ); +} + +/** + * Registers the `core/tag-cloud` block on server. + * + * @since 5.2.0 + */ +function register_block_core_tag_cloud() { + register_block_type_from_metadata( + __DIR__ . '/tag-cloud', + array( + 'render_callback' => 'render_block_core_tag_cloud', + ) + ); +} +add_action( 'init', 'register_block_core_tag_cloud' ); diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json new file mode 100644 index 0000000000000..044bc0c533376 --- /dev/null +++ b/src/wp-includes/blocks/tag-cloud/block.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 3, + "name": "core/tag-cloud", + "title": "Tag Cloud", + "category": "widgets", + "description": "A cloud of popular keywords, each sized by how often it appears.", + "textdomain": "default", + "attributes": { + "numberOfTags": { + "type": "number", + "default": 45, + "minimum": 1, + "maximum": 100 + }, + "taxonomy": { + "type": "string", + "default": "post_tag" + }, + "showTagCounts": { + "type": "boolean", + "default": false + }, + "smallestFontSize": { + "type": "string", + "default": "8pt" + }, + "largestFontSize": { + "type": "string", + "default": "22pt" + } + }, + "styles": [ + { "name": "default", "label": "Default", "isDefault": true }, + { "name": "outline", "label": "Outline" } + ], + "supports": { + "html": false, + "align": true, + "spacing": { + "margin": true, + "padding": true + }, + "typography": { + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true + }, + "interactivity": { + "clientNavigation": true + }, + "__experimentalBorder": { + "radius": true, + "color": true, + "width": true, + "style": true, + "__experimentalDefaultControls": { + "radius": true, + "color": true, + "width": true, + "style": 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 new file mode 100644 index 0000000000000..c73b64408733d --- /dev/null +++ b/src/wp-includes/blocks/template-part.php @@ -0,0 +1,303 @@ + 'wp_template_part', + 'post_status' => 'publish', + 'post_name__in' => array( $attributes['slug'] ), + 'tax_query' => array( + array( + 'taxonomy' => 'wp_theme', + 'field' => 'name', + 'terms' => $theme, + ), + ), + 'posts_per_page' => 1, + 'no_found_rows' => true, + 'lazy_load_term_meta' => false, // Do not lazy load term meta, as template parts only have one term. + ) + ); + $template_part_post = $template_part_query->have_posts() ? $template_part_query->next_post() : null; + if ( $template_part_post ) { + // A published post might already exist if this template part was customized elsewhere + // or if it's part of a customized template. + $block_template = _build_block_template_result_from_post( $template_part_post ); + $content = $block_template->content; + if ( isset( $block_template->area ) ) { + $area = $block_template->area; + } + /** + * Fires when a block template part is loaded from a template post stored in the database. + * + * @since 5.9.0 + * + * @param string $template_part_id The requested template part namespaced to the theme. + * @param array $attributes The block attributes. + * @param WP_Post $template_part_post The template part post object. + * @param string $content The template part content. + */ + do_action( 'render_block_core_template_part_post', $template_part_id, $attributes, $template_part_post, $content ); + } else { + $template_part_file_path = ''; + // Else, if the template part was provided by the active theme, + // render the corresponding file content. + if ( 0 === validate_file( $attributes['slug'] ) ) { + $block_template = get_block_file_template( $template_part_id, 'wp_template_part' ); + + if ( isset( $block_template->content ) ) { + $content = $block_template->content; + } + if ( isset( $block_template->area ) ) { + $area = $block_template->area; + } + + // Needed for the `render_block_core_template_part_file` and `render_block_core_template_part_none` actions below. + $block_template_file = _get_block_template_file( 'wp_template_part', $attributes['slug'] ); + if ( $block_template_file ) { + $template_part_file_path = $block_template_file['path']; + } + } + + if ( '' !== $content && null !== $content ) { + /** + * Fires when a block template part is loaded from a template part in the theme. + * + * @since 5.9.0 + * + * @param string $template_part_id The requested template part namespaced to the theme. + * @param array $attributes The block attributes. + * @param string $template_part_file_path Absolute path to the template path. + * @param string $content The template part content. + */ + do_action( 'render_block_core_template_part_file', $template_part_id, $attributes, $template_part_file_path, $content ); + } else { + /** + * Fires when a requested block template part does not exist in the database nor in the theme. + * + * @since 5.9.0 + * + * @param string $template_part_id The requested template part namespaced to the theme. + * @param array $attributes The block attributes. + * @param string $template_part_file_path Absolute path to the not found template path. + */ + do_action( 'render_block_core_template_part_none', $template_part_id, $attributes, $template_part_file_path ); + } + } + } + + // WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent + // is set in `wp_debug_mode()`. + $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY; + + if ( is_null( $content ) ) { + if ( $is_debug && isset( $attributes['slug'] ) ) { + return sprintf( + /* translators: %s: Template part slug. */ + __( 'Template part has been deleted or is unavailable: %s' ), + $attributes['slug'] + ); + } + + return ''; + } + + if ( isset( $seen_ids[ $template_part_id ] ) ) { + return $is_debug ? + // translators: Visible only in the front end, this warning takes the place of a faulty block. + __( '[block rendering halted]' ) : + ''; + } + + // 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. + $content = shortcode_unautop( $content ); + $content = do_shortcode( $content ); + $seen_ids[ $template_part_id ] = true; + $content = do_blocks( $content ); + unset( $seen_ids[ $template_part_id ] ); + $content = wptexturize( $content ); + $content = convert_smilies( $content ); + $content = wp_filter_content_tags( $content, "template_part_{$area}" ); + + // Handle embeds for block template parts. + global $wp_embed; + $content = $wp_embed->autoembed( $content ); + + if ( empty( $attributes['tagName'] ) || tag_escape( $attributes['tagName'] ) !== $attributes['tagName'] ) { + $area_tag = 'div'; + if ( $area_definition && isset( $area_definition['area_tag'] ) ) { + $area_tag = $area_definition['area_tag']; + } + $html_tag = $area_tag; + } else { + $html_tag = esc_attr( $attributes['tagName'] ); + } + $wrapper_attributes = get_block_wrapper_attributes(); + + return "<$html_tag $wrapper_attributes>" . str_replace( ']]>', ']]>', $content ) . ""; +} + +/** + * Returns an array of area variation objects for the template part block. + * + * @since 6.1.0 + * + * @param array $instance_variations The variations for instances. + * + * @return array Array containing the block variation objects. + */ +function build_template_part_block_area_variations( $instance_variations ) { + $variations = array(); + $defined_areas = get_allowed_block_template_part_areas(); + + foreach ( $defined_areas as $area ) { + if ( 'uncategorized' !== $area['area'] ) { + $has_instance_for_area = false; + foreach ( $instance_variations as $variation ) { + if ( $variation['attributes']['area'] === $area['area'] ) { + $has_instance_for_area = true; + break; + } + } + + $scope = $has_instance_for_area ? array() : array( 'inserter' ); + + $variations[] = array( + 'name' => 'area_' . $area['area'], + 'title' => $area['label'], + 'description' => $area['description'], + 'attributes' => array( + 'area' => $area['area'], + ), + 'scope' => $scope, + 'icon' => $area['icon'], + ); + } + } + return $variations; +} + +/** + * Returns an array of instance variation objects for the template part block + * + * @since 6.1.0 + * + * @return array Array containing the block variation objects. + */ +function build_template_part_block_instance_variations() { + // Block themes are unavailable during installation. + if ( wp_installing() ) { + return array(); + } + + if ( ! current_theme_supports( 'block-templates' ) && ! current_theme_supports( 'block-template-parts' ) ) { + return array(); + } + + $variations = array(); + $template_parts = get_block_templates( + array( + 'post_type' => 'wp_template_part', + ), + 'wp_template_part' + ); + + $defined_areas = get_allowed_block_template_part_areas(); + $icon_by_area = array_combine( array_column( $defined_areas, 'area' ), array_column( $defined_areas, 'icon' ) ); + + foreach ( $template_parts as $template_part ) { + $variations[] = array( + 'name' => 'instance_' . sanitize_title( $template_part->slug ), + 'title' => $template_part->title, + // If there's no description for the template part don't show the + // block description. This is a bit hacky, but prevent the fallback + // by using a non-breaking space so that the value of description + // isn't falsey. + 'description' => $template_part->description || ' ', + 'attributes' => array( + 'slug' => $template_part->slug, + 'theme' => $template_part->theme, + 'area' => $template_part->area, + ), + 'scope' => array( 'inserter' ), + 'icon' => isset( $icon_by_area[ $template_part->area ] ) ? $icon_by_area[ $template_part->area ] : null, + 'example' => array( + 'attributes' => array( + 'slug' => $template_part->slug, + 'theme' => $template_part->theme, + 'area' => $template_part->area, + ), + ), + ); + } + return $variations; +} + +/** + * Returns an array of all template part block variations. + * + * @since 5.9.0 + * + * @return array Array containing the block variation objects. + */ +function build_template_part_block_variations() { + $instance_variations = build_template_part_block_instance_variations(); + $area_variations = build_template_part_block_area_variations( $instance_variations ); + return array_merge( $area_variations, $instance_variations ); +} + +/** + * Registers the `core/template-part` block on the server. + * + * @since 5.9.0 + */ +function register_block_core_template_part() { + register_block_type_from_metadata( + __DIR__ . '/template-part', + array( + 'render_callback' => 'render_block_core_template_part', + 'variation_callback' => 'build_template_part_block_variations', + ) + ); +} +add_action( 'init', 'register_block_core_template_part' ); diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json new file mode 100644 index 0000000000000..9710bdeee2e53 --- /dev/null +++ b/src/wp-includes/blocks/template-part/block.json @@ -0,0 +1,33 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 3, + "name": "core/template-part", + "title": "Template Part", + "category": "theme", + "description": "Edit the different global regions of your site, like the header, footer, sidebar, or create your own.", + "textdomain": "default", + "attributes": { + "slug": { + "type": "string" + }, + "theme": { + "type": "string" + }, + "tagName": { + "type": "string" + }, + "area": { + "type": "string" + } + }, + "supports": { + "align": true, + "html": false, + "reusable": false, + "renaming": false, + "interactivity": { + "clientNavigation": true + } + }, + "editorStyle": "wp-block-template-part-editor" +} diff --git a/src/wp-includes/blocks/term-count.php b/src/wp-includes/blocks/term-count.php new file mode 100644 index 0000000000000..9794896524eb4 --- /dev/null +++ b/src/wp-includes/blocks/term-count.php @@ -0,0 +1,80 @@ +context['termId'] ) && isset( $block->context['taxonomy'] ) ) { + $term = get_term( $block->context['termId'], $block->context['taxonomy'] ); + } else { + $term = get_queried_object(); + if ( ! $term instanceof WP_Term ) { + $term = null; + } + } + + if ( ! $term || is_wp_error( $term ) ) { + return ''; + } + + $term_count = $term->count; + + // Format the term count based on bracket type. + switch ( $attributes['bracketType'] ) { + case 'none': + // No formatting needed. + break; + case 'round': + $term_count = "({$term_count})"; + break; + case 'square': + $term_count = "[{$term_count}]"; + break; + case 'curly': + $term_count = "{{$term_count}}"; + break; + case 'angle': + $term_count = "<{$term_count}>"; + break; + default: + // Default to no formatting for unknown types. + break; + } + + $wrapper_attributes = get_block_wrapper_attributes(); + + return sprintf( + '%2$s
',
+ $wrapper_attributes,
+ $term_count
+ );
+}
+
+/**
+ * Registers the `core/term-count` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_term_count() {
+ register_block_type_from_metadata(
+ __DIR__ . '/term-count',
+ array(
+ 'render_callback' => 'render_block_core_term_count',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_term_count' );
diff --git a/src/wp-includes/blocks/term-count/block.json b/src/wp-includes/blocks/term-count/block.json
new file mode 100644
index 0000000000000..c4de1e61f8d1f
--- /dev/null
+++ b/src/wp-includes/blocks/term-count/block.json
@@ -0,0 +1,58 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/term-count",
+ "title": "Term Count",
+ "category": "theme",
+ "description": "Displays the post count of a taxonomy term.",
+ "textdomain": "default",
+ "usesContext": [ "termId", "taxonomy" ],
+ "attributes": {
+ "bracketType": {
+ "type": "string",
+ "enum": [ "none", "round", "square", "curly", "angle" ],
+ "default": "round"
+ }
+ },
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "spacing": {
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-term-count"
+}
diff --git a/src/wp-includes/blocks/term-description.php b/src/wp-includes/blocks/term-description.php
new file mode 100644
index 0000000000000..9f61dbba07fbc
--- /dev/null
+++ b/src/wp-includes/blocks/term-description.php
@@ -0,0 +1,61 @@
+context['termId'] ) && isset( $block->context['taxonomy'] ) ) {
+ $term = get_term( $block->context['termId'], $block->context['taxonomy'] );
+ if ( $term && ! is_wp_error( $term ) ) {
+ $term_description = $term->description;
+ }
+ } elseif ( is_category() || is_tag() || is_tax() ) {
+ $term_description = term_description();
+ }
+
+ if ( empty( $term_description ) ) {
+ return '';
+ }
+
+ $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 '' . $term_description . '
';
+}
+
+/**
+ * Registers the `core/term-description` block on the server.
+ *
+ * @since 5.9.0
+ */
+function register_block_core_term_description() {
+ register_block_type_from_metadata(
+ __DIR__ . '/term-description',
+ array(
+ 'render_callback' => 'render_block_core_term_description',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_term_description' );
diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json
new file mode 100644
index 0000000000000..a882625ad6f50
--- /dev/null
+++ b/src/wp-includes/blocks/term-description/block.json
@@ -0,0 +1,58 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/term-description",
+ "title": "Term Description",
+ "category": "theme",
+ "description": "Display the description of categories, tags and custom taxonomies when viewing an archive.",
+ "textdomain": "default",
+ "usesContext": [ "termId", "taxonomy" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ }
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "spacing": {
+ "padding": true,
+ "margin": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/term-name.php b/src/wp-includes/blocks/term-name.php
new file mode 100644
index 0000000000000..3a2bf18bb5f21
--- /dev/null
+++ b/src/wp-includes/blocks/term-name.php
@@ -0,0 +1,81 @@
+context['termId'] ) && isset( $block->context['taxonomy'] ) ) {
+ $term = get_term( $block->context['termId'], $block->context['taxonomy'] );
+ } else {
+ $term = get_queried_object();
+ if ( ! $term instanceof WP_Term ) {
+ $term = null;
+ }
+ }
+
+ if ( ! $term || is_wp_error( $term ) ) {
+ return '';
+ }
+
+ $term_name = $term->name;
+ $level = isset( $attributes['level'] ) ? $attributes['level'] : 0;
+ $tag_name = 0 === $level ? 'p' : 'h' . (int) $level;
+
+ if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
+ $term_link = get_term_link( $term );
+ if ( ! is_wp_error( $term_link ) ) {
+ $term_name = sprintf(
+ '%2$s',
+ esc_url( $term_link ),
+ $term_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',
+ $tag_name,
+ $wrapper_attributes,
+ $term_name
+ );
+}
+
+/**
+ * Registers the `core/term-name` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_term_name() {
+ register_block_type_from_metadata(
+ __DIR__ . '/term-name',
+ array(
+ 'render_callback' => 'render_block_core_term_name',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_term_name' );
diff --git a/src/wp-includes/blocks/term-name/block.json b/src/wp-includes/blocks/term-name/block.json
new file mode 100644
index 0000000000000..29b0cbe22b77e
--- /dev/null
+++ b/src/wp-includes/blocks/term-name/block.json
@@ -0,0 +1,68 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/term-name",
+ "title": "Term Name",
+ "category": "theme",
+ "description": "Displays the name of a taxonomy term.",
+ "keywords": [ "term title" ],
+ "textdomain": "default",
+ "usesContext": [ "termId", "taxonomy" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "level": {
+ "type": "number",
+ "default": 0
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false
+ }
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "spacing": {
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-term-name"
+}
diff --git a/src/wp-includes/blocks/term-template.php b/src/wp-includes/blocks/term-template.php
new file mode 100644
index 0000000000000..3cbe21f60c0d4
--- /dev/null
+++ b/src/wp-includes/blocks/term-template.php
@@ -0,0 +1,137 @@
+context ) || empty( $block->context['termQuery'] ) ) {
+ return '';
+ }
+
+ $query = $block->context['termQuery'];
+
+ $query_args = array(
+ 'number' => $query['perPage'],
+ 'order' => $query['order'],
+ 'orderby' => $query['orderBy'],
+ 'hide_empty' => $query['hideEmpty'],
+ );
+
+ $inherit_query = isset( $query['inherit'] )
+ && $query['inherit']
+ && ( is_tax() || is_category() || is_tag() );
+
+ if ( $inherit_query ) {
+ // Get the current term and taxonomy from the queried object.
+ $queried_object = get_queried_object();
+
+ // For hierarchical taxonomies, show children of the current term.
+ // For non-hierarchical taxonomies, show all terms (don't set parent).
+ if ( is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
+ // If showNested is true, use child_of to include nested terms.
+ // Otherwise, use parent to show only direct children.
+ if ( ! empty( $query['showNested'] ) ) {
+ $query_args['child_of'] = $queried_object->term_id;
+ } else {
+ $query_args['parent'] = $queried_object->term_id;
+ }
+ }
+ $query_args['taxonomy'] = $queried_object->taxonomy;
+ } else {
+ // If not inheriting set `taxonomy` from the block attribute.
+ $query_args['taxonomy'] = $query['taxonomy'];
+
+ // If we are including specific terms we ignore `showNested` argument.
+ if ( ! empty( $query['include'] ) ) {
+ $query_args['include'] = array_unique( array_map( 'intval', $query['include'] ) );
+ $query_args['orderby'] = 'include';
+ $query_args['order'] = 'asc';
+ } elseif ( empty( $query['showNested'] ) ) {
+ // We set parent only when inheriting from the taxonomy archive context or not
+ // showing nested terms, otherwise nested terms are not displayed.
+ $query_args['parent'] = 0;
+ }
+ }
+
+ $terms_query = new WP_Term_Query( $query_args );
+ $terms = $terms_query->get_terms();
+
+ if ( ! $terms || is_wp_error( $terms ) ) {
+ return '';
+ }
+
+ $content = '';
+ foreach ( $terms as $term ) {
+ // Get an instance of the current Term Template block.
+ $block_instance = $block->parsed_block;
+
+ // Set the block name to one that does not correspond to an existing registered block.
+ // This ensures that for the inner instances of the Term Template block, we do not render any block supports.
+ $block_instance['blockName'] = 'core/null';
+
+ $term_id = $term->term_id;
+ $taxonomy = $term->taxonomy;
+
+ $filter_block_context = static function ( $context ) use ( $term_id, $taxonomy ) {
+ $context['termId'] = $term_id;
+ $context['taxonomy'] = $taxonomy;
+ return $context;
+ };
+
+ // Use an early priority to so that other 'render_block_context' filters have access to the values.
+ add_filter( 'render_block_context', $filter_block_context, 1 );
+
+ // Render the inner blocks of the Term Template block with `dynamic` set to `false` to prevent calling
+ // `render_callback` and ensure that no wrapper markup is included.
+ $block_content = ( new WP_Block( $block_instance ) )->render( array( 'dynamic' => false ) );
+
+ remove_filter( 'render_block_context', $filter_block_context, 1 );
+
+ // Wrap the render inner blocks in a `li` element with the appropriate term classes.
+ $term_classes = "wp-block-term term-{$term->term_id} {$term->taxonomy} taxonomy-{$term->taxonomy}";
+
+ $content .= '- %s
Page
%1$sof %2$d
",
+ "paging"
+ ),
+ "Page
%1$sof %2$d
","paging"),"Page
%1$sof %2$d
",
+ "paging"
+ ),
+ "Page
%1$sof %2$d
","paging"),"Page
%1$sof %2$d
",
+ "paging"
+ ),
+ "Page
%1$sof %2$d
","paging"),"Page
%1$sof %2$d
",
+ "paging"
+ ),
+ "Page
%1$sof %2$d
","paging"),"Page
%1$sof %2$d
",
+ "paging"
+ ),
+ "Page
%1$sof %2$d
","paging"),"Page
%1$sof %2$d
",
+ "paging"
+ ),
+ "Page
%1$sof %2$d
","paging"),"First Gutenberg Paragraph
+First Gutenberg Paragraph
Second Auto Paragraph
@@ -11,7 +11,7 @@ -Third Gutenberg Paragraph
+Third Gutenberg Paragraph
Third Auto Paragraph
diff --git a/tests/phpunit/data/blocks/fixtures/core__categories.server.html b/tests/phpunit/data/blocks/fixtures/core__categories.server.html index f10bd41b123bc..f073f8f5ee213 100644 --- a/tests/phpunit/data/blocks/fixtures/core__categories.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__categories.server.html @@ -1 +1 @@ -- No categories
- No categories
-
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__columns.server.html
index fa39f71320056..02d855cbd6c38 100644
--- a/tests/phpunit/data/blocks/fixtures/core__columns.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__columns.server.html
@@ -1,24 +1,24 @@
-Column One, Paragraph One
- - -Column One, Paragraph Two
- + +Column One, Paragraph One
+ + +Column One, Paragraph Two
+
-
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__media-text__is-stacked-on-mobile.server.html b/tests/phpunit/data/blocks/fixtures/core__media-text__is-stacked-on-mobile.server.html
index a8ddd142e6c00..5a1c3993f54c9 100644
--- a/tests/phpunit/data/blocks/fixtures/core__media-text__is-stacked-on-mobile.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__media-text__is-stacked-on-mobile.server.html
@@ -5,7 +5,7 @@
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html b/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html
index af37434febcf8..6b695d15963de 100644
--- a/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html
@@ -1,16 +1,16 @@
-
-
-
-
-
+
+
Column One, Paragraph One
- - -Column One, Paragraph Two
- + +Column One, Paragraph One
+ + +Column One, Paragraph Two
+
-
-
-
+
Column Two, Paragraph One
- - -Column Three, Paragraph One
- + +Column Two, Paragraph One
+ + +Column Three, Paragraph One
+
-
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__media-text__image-alt-no-align.server.html b/tests/phpunit/data/blocks/fixtures/core__media-text__image-alt-no-align.server.html
index 15d5feec2b849..c25f5431b6809 100644
--- a/tests/phpunit/data/blocks/fixtures/core__media-text__image-alt-no-align.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__media-text__image-alt-no-align.server.html
@@ -5,7 +5,7 @@
Column One, Paragraph One
- - -Column One, Paragraph Two
- - -Column Two, Paragraph One
- - -Column Three, Paragraph One
- +
+
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__media-text.server.html b/tests/phpunit/data/blocks/fixtures/core__media-text.server.html
index 9093acb972b23..e472aeb90e182 100644
--- a/tests/phpunit/data/blocks/fixtures/core__media-text.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__media-text.server.html
@@ -5,7 +5,7 @@
Column One, Paragraph One
+ + +Column One, Paragraph Two
+ + +Column Two, Paragraph One
+ + +Column Three, Paragraph One
+
-
My Content
+My Content
-
Content
+Content
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__media-text__media-right-custom-width.server.html b/tests/phpunit/data/blocks/fixtures/core__media-text__media-right-custom-width.server.html
index 2c2cbe3da310d..41edc3e02ebb8 100644
--- a/tests/phpunit/data/blocks/fixtures/core__media-text__media-right-custom-width.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__media-text__media-right-custom-width.server.html
@@ -5,7 +5,7 @@
My Content
+My Content
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__media-text__video.server.html b/tests/phpunit/data/blocks/fixtures/core__media-text__video.server.html
index 4328c16b367a0..88e9393dd75f2 100644
--- a/tests/phpunit/data/blocks/fixtures/core__media-text__video.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__media-text__video.server.html
@@ -5,7 +5,7 @@
My video
+My video
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__paragraph__align-right.server.html b/tests/phpunit/data/blocks/fixtures/core__paragraph__align-right.server.html
index 4c6b5d6ffad0a..1db164ca1fb5b 100644
--- a/tests/phpunit/data/blocks/fixtures/core__paragraph__align-right.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__paragraph__align-right.server.html
@@ -1,3 +1,3 @@
-My Content
+My Content
... like this one, which is separate from the above and right aligned.
+... like this one, which is separate from the above and right aligned.
diff --git a/tests/phpunit/data/html-api/script-element-escaping-diagram.dot b/tests/phpunit/data/html-api/script-element-escaping-diagram.dot deleted file mode 100644 index ae6789cae2f27..0000000000000 --- a/tests/phpunit/data/html-api/script-element-escaping-diagram.dot +++ /dev/null @@ -1,33 +0,0 @@ -// https://html.spec.whatwg.org/multipage/parsing.html#script-data-state -digraph { - rankdir=TB; - node [width=1, height=1, fixedsize=true]; - - // Entry point - entry [shape=plaintext label="Open script"]; - entry -> script_data; - - // Double-circle states arranged more compactly - data [shape=doublecircle label="Close script"]; - script_data [shape=doublecircle color=blue label="script\ndata"]; - script_data_escaped [shape=circle color=orange label="escaped"]; - script_data_double_escaped [shape=circle color=red label="double\nescaped"]; - - // Group related nodes on same ranks where possible - {rank=same; script_data script_data_escaped script_data_double_escaped} - - script_data -> script_data [headport=sw, tailport=sw, label=<<!--*>(all dashes)>]; - script_data -> script_data_escaped [label=<<!-->]; - script_data -> data [label=<</script¹>]; - - script_data_escaped -> script_data [label=<-->>]; - script_data_escaped -> script_data_double_escaped [label=<<script¹>]; - script_data_escaped -> data [label=<</script¹>]; - - // The newline before the label prevents the edge from drawing over it. - script_data_double_escaped -> script_data [label=<
-->>]; - script_data_double_escaped -> script_data_escaped [label=<</script¹>]; - - label=<¹ = Case insensitive “script” followed by one of “ \\t\\f\\r\\n/>”>; - labelloc=b; -} diff --git a/tests/phpunit/data/html-api/script-element-escaping-diagram.php b/tests/phpunit/data/html-api/script-element-escaping-diagram.php deleted file mode 100644 index 20c10f5711347..0000000000000 --- a/tests/phpunit/data/html-api/script-element-escaping-diagram.php +++ /dev/null @@ -1,13 +0,0 @@ -factory = static::factory(); @@ -118,6 +112,8 @@ public function set_up() { $this->_backup_hooks(); } + global $wp_rewrite; + $this->clean_up_global_scope(); /* @@ -146,10 +142,10 @@ public function set_up() { /** * Sets the bcrypt cost option for password hashing during tests. * - * @param array $options The options for password hashing. - * @param string $algorithm The algorithm to use for hashing. + * @param array $options The options for password hashing. + * @param string|int $algorithm The algorithm to use for hashing. This is a string in PHP 7.4+ and an integer in PHP 7.3 and earlier. */ - public function wp_hash_password_options( array $options, string $algorithm ): array { + public function wp_hash_password_options( array $options, $algorithm ): array { if ( PASSWORD_BCRYPT === $algorithm ) { $options['cost'] = 5; } @@ -159,17 +155,10 @@ public function wp_hash_password_options( array $options, string $algorithm ): a /** * After a test method runs, resets any state in WordPress the test method might have changed. - * - * @global wpdb $wpdb WordPress database abstraction object. - * @global WP_Query $wp_the_query Main WordPress query object. - * @global WP_Query $wp_query WordPress query object. - * @global WP $wp WordPress environment object. */ public function tear_down() { global $wpdb, $wp_the_query, $wp_query, $wp; - $wpdb->query( 'ROLLBACK' ); - if ( is_multisite() ) { while ( ms_is_switched() ) { restore_current_blog(); @@ -370,10 +359,10 @@ protected function reset__SERVER() { * Stores $wp_filter, $wp_actions, $wp_filters, and $wp_current_filter * on a class variable so they can be restored on tear_down() using _restore_hooks(). * - * @global array $wp_filter All of the filters and actions. - * @global array $wp_actions The number of times each action was triggered. - * @global array $wp_filters The number of times each filter was triggered. - * @global array $wp_current_filter The list of current filters with the current one last. + * @global array $wp_filter + * @global array $wp_actions + * @global array $wp_filters + * @global array $wp_current_filter */ protected function _backup_hooks() { self::$hooks_saved['wp_filter'] = array(); @@ -393,10 +382,10 @@ protected function _backup_hooks() { * Restores the hook-related globals to their state at set_up() * so that future tests aren't affected by hooks set during this last test. * - * @global array $wp_filter All of the filters and actions. - * @global array $wp_actions The number of times each action was triggered. - * @global array $wp_filters The number of times each filter was triggered. - * @global array $wp_current_filter The list of current filters with the current one last. + * @global array $wp_filter + * @global array $wp_actions + * @global array $wp_filters + * @global array $wp_current_filter */ protected function _restore_hooks() { if ( isset( self::$hooks_saved['wp_filter'] ) ) { @@ -418,8 +407,6 @@ protected function _restore_hooks() { /** * Flushes the WordPress object cache. - * - * @global WP_Object_Cache $wp_object_cache WordPress Object Cache object. */ public static function flush_cache() { global $wp_object_cache; @@ -465,15 +452,13 @@ public static function flush_cache() { * * @since 5.1.0 * - * @global array $wp_meta_keys Global registry for meta keys. + * @global array $wp_meta_keys */ public function unregister_all_meta_keys() { global $wp_meta_keys; - if ( ! is_array( $wp_meta_keys ) ) { return; } - foreach ( $wp_meta_keys as $object_type => $type_keys ) { foreach ( $type_keys as $object_subtype => $subtype_keys ) { foreach ( $subtype_keys as $key => $value ) { @@ -485,15 +470,11 @@ public function unregister_all_meta_keys() { /** * Starts a database transaction. - * - * @global wpdb $wpdb WordPress database abstraction object. */ public function start_transaction() { global $wpdb; - $wpdb->query( 'SET autocommit = 0;' ); $wpdb->query( 'START TRANSACTION;' ); - add_filter( 'query', array( $this, '_create_temporary_tables' ) ); add_filter( 'query', array( $this, '_drop_temporary_tables' ) ); } @@ -502,12 +483,9 @@ public function start_transaction() { * Commits the queries in a transaction. * * @since 4.1.0 - * - * @global wpdb $wpdb WordPress database abstraction object. */ public static function commit_transaction() { global $wpdb; - $wpdb->query( 'COMMIT;' ); } @@ -1155,8 +1133,6 @@ public function normalizeDirectorySeparatorsInPath( $path ) { * @since 5.3.0 Formalized the existing `...$prop` parameter by adding it * to the function signature. * - * @global WP_Query $wp_query WordPress Query object. - * * @param string ...$prop Any number of WP_Query properties that are expected to be true for the current request. */ public function assertQueryTrue( ...$prop ) { @@ -1619,6 +1595,14 @@ public function scandir( $dir ) { } } + /* + * Compatibility check for PHP < 7.4, where array_merge() expects at least one array. + * See: https://3v4l.org/BIQMA + */ + if ( array() === $matched_dirs ) { + return array(); + } + return array_merge( ...$matched_dirs ); } @@ -1656,7 +1640,7 @@ public static function delete_user( $user_id ) { * * @since 4.4.0 * - * @global WP_Rewrite $wp_rewrite WordPress rewrite rules object. + * @global WP_Rewrite $wp_rewrite * * @param string $structure Optional. Permalink structure to set. Default empty. */ diff --git a/tests/phpunit/includes/build-visual-html-tree.php b/tests/phpunit/includes/build-visual-html-tree.php index 9d2850ce4947c..ac31a0ac071db 100644 --- a/tests/phpunit/includes/build-visual-html-tree.php +++ b/tests/phpunit/includes/build-visual-html-tree.php @@ -1,5 +1,7 @@ get_modifiable_text(); - if ( '' === $text_content ) { + if ( '' === trim( $text_content, " \f\t\r\n" ) ) { break; } $was_text = true; @@ -235,7 +237,7 @@ static function ( $a, $b ) { ++$indent_level; } - // When no attributes are present, there’s nothing left to do. + // If they're no attributes, we're done here. if ( empty( $block_attrs ) ) { break; } @@ -276,6 +278,7 @@ static function ( $a, $b ) { } break; default: + // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export $serialized_token_type = var_export( $processor->get_token_type(), true ); throw new Exception( "Unhandled token type for tree construction: {$serialized_token_type}" ); } diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php index d6b6218278ae3..66e916e94876d 100644 --- a/tests/phpunit/includes/functions.php +++ b/tests/phpunit/includes/functions.php @@ -375,18 +375,6 @@ function _unhook_font_registration() { } tests_add_filter( 'init', '_unhook_font_registration', 1000 ); -/** - * After the init action has been run once, trying to re-register connector settings can cause - * duplicate registrations. To avoid this, unhook the connector registration functions. - * - * @since 7.0.0 - */ -function _unhook_connector_registration() { - remove_action( 'init', '_wp_register_default_connector_settings', 20 ); - remove_action( 'init', '_wp_connectors_pass_default_keys_to_ai_client', 20 ); -} -tests_add_filter( 'init', '_unhook_connector_registration', 1000 ); - /** * Before the abilities API categories init action runs, unhook the core ability * categories registration function to prevent core categories from being registered diff --git a/tests/phpunit/includes/unregister-blocks-hooks.php b/tests/phpunit/includes/unregister-blocks-hooks.php index 116b4191766bb..b67936a103c81 100644 --- a/tests/phpunit/includes/unregister-blocks-hooks.php +++ b/tests/phpunit/includes/unregister-blocks-hooks.php @@ -1,14 +1,79 @@ create_test_text_model_metadata(); - - $provider_metadata = new ProviderMetadata( - 'mock', - 'Mock Provider', - ProviderTypeEnum::cloud() - ); - - return new class( $metadata, $provider_metadata, $result ) implements ModelInterface, TextGenerationModelInterface { - - private ModelMetadata $metadata; - private ProviderMetadata $provider_metadata; - private GenerativeAiResult $result; - private ModelConfig $config; - - public function __construct( - ModelMetadata $metadata, - ProviderMetadata $provider_metadata, - GenerativeAiResult $result - ) { - $this->metadata = $metadata; - $this->provider_metadata = $provider_metadata; - $this->result = $result; - $this->config = new ModelConfig(); - } - - public function metadata(): ModelMetadata { - return $this->metadata; - } - - public function providerMetadata(): ProviderMetadata { - return $this->provider_metadata; - } - - public function setConfig( ModelConfig $config ): void { - $this->config = $config; - } - - public function getConfig(): ModelConfig { - return $this->config; - } - - public function generateTextResult( array $prompt ): GenerativeAiResult { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - return $this->result; - } - - public function streamGenerateTextResult( array $prompt ): Generator { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - yield $this->result; - } - }; - } - - /** - * Creates a mock image generation model using anonymous class. - * - * @param GenerativeAiResult $result The result to return from generation. - * @param ModelMetadata|null $metadata Optional metadata. - * @return ModelInterface&ImageGenerationModelInterface The mock model. - */ - protected function create_mock_image_generation_model( - GenerativeAiResult $result, - ?ModelMetadata $metadata = null - ): ModelInterface { - $metadata = $metadata ?? $this->create_test_image_model_metadata(); - - $provider_metadata = new ProviderMetadata( - 'mock', - 'Mock Provider', - ProviderTypeEnum::cloud() - ); - - return new class( $metadata, $provider_metadata, $result ) implements ModelInterface, ImageGenerationModelInterface { - - private ModelMetadata $metadata; - private ProviderMetadata $provider_metadata; - private GenerativeAiResult $result; - private ModelConfig $config; - - public function __construct( - ModelMetadata $metadata, - ProviderMetadata $provider_metadata, - GenerativeAiResult $result - ) { - $this->metadata = $metadata; - $this->provider_metadata = $provider_metadata; - $this->result = $result; - $this->config = new ModelConfig(); - } - - public function metadata(): ModelMetadata { - return $this->metadata; - } - - public function providerMetadata(): ProviderMetadata { - return $this->provider_metadata; - } - - public function setConfig( ModelConfig $config ): void { - $this->config = $config; - } - - public function getConfig(): ModelConfig { - return $this->config; - } - - public function generateImageResult( array $prompt ): GenerativeAiResult { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - return $this->result; - } - }; - } - - /** - * Creates a mock speech generation model using anonymous class. - * - * @param GenerativeAiResult $result The result to return from generation. - * @param ModelMetadata|null $metadata Optional metadata. - * @return ModelInterface&SpeechGenerationModelInterface The mock model. - */ - protected function create_mock_speech_generation_model( - GenerativeAiResult $result, - ?ModelMetadata $metadata = null - ): ModelInterface { - $metadata = $metadata ?? $this->create_test_speech_model_metadata(); - - $provider_metadata = new ProviderMetadata( - 'mock-provider', - 'Mock Provider', - ProviderTypeEnum::cloud() - ); - - return new class( $metadata, $provider_metadata, $result ) implements ModelInterface, SpeechGenerationModelInterface { - - private ModelMetadata $metadata; - private ProviderMetadata $provider_metadata; - private GenerativeAiResult $result; - private ModelConfig $config; - - public function __construct( - ModelMetadata $metadata, - ProviderMetadata $provider_metadata, - GenerativeAiResult $result - ) { - $this->metadata = $metadata; - $this->provider_metadata = $provider_metadata; - $this->result = $result; - $this->config = new ModelConfig(); - } - - public function metadata(): ModelMetadata { - return $this->metadata; - } - - public function providerMetadata(): ProviderMetadata { - return $this->provider_metadata; - } - - public function setConfig( ModelConfig $config ): void { - $this->config = $config; - } - - public function getConfig(): ModelConfig { - return $this->config; - } - - public function generateSpeechResult( array $prompt ): GenerativeAiResult { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - return $this->result; - } - }; - } - - /** - * Creates a mock text-to-speech conversion model using anonymous class. - * - * @param GenerativeAiResult $result The result to return from conversion. - * @param ModelMetadata|null $metadata Optional metadata. - * @return ModelInterface&TextToSpeechConversionModelInterface The mock model. - */ - protected function create_mock_text_to_speech_model( - GenerativeAiResult $result, - ?ModelMetadata $metadata = null - ): ModelInterface { - $metadata = $metadata ?? $this->create_test_text_to_speech_model_metadata(); - - $provider_metadata = new ProviderMetadata( - 'mock-provider', - 'Mock Provider', - ProviderTypeEnum::cloud() - ); - - return new class( $metadata, $provider_metadata, $result ) implements ModelInterface, TextToSpeechConversionModelInterface { - - private ModelMetadata $metadata; - private ProviderMetadata $provider_metadata; - private GenerativeAiResult $result; - private ModelConfig $config; - - public function __construct( - ModelMetadata $metadata, - ProviderMetadata $provider_metadata, - GenerativeAiResult $result - ) { - $this->metadata = $metadata; - $this->provider_metadata = $provider_metadata; - $this->result = $result; - $this->config = new ModelConfig(); - } - - public function metadata(): ModelMetadata { - return $this->metadata; - } - - public function providerMetadata(): ProviderMetadata { - return $this->provider_metadata; - } - - public function setConfig( ModelConfig $config ): void { - $this->config = $config; - } - - public function getConfig(): ModelConfig { - return $this->config; - } - - public function convertTextToSpeechResult( array $prompt ): GenerativeAiResult { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - return $this->result; - } - }; - } - - /** - * Creates a mock video generation model using anonymous class. - * - * @param GenerativeAiResult $result The result to return from generation. - * @param ModelMetadata|null $metadata Optional metadata. - * @return ModelInterface&VideoGenerationModelInterface The mock model. - */ - protected function create_mock_video_generation_model( - GenerativeAiResult $result, - ?ModelMetadata $metadata = null - ): ModelInterface { - $metadata = $metadata ?? $this->create_test_video_model_metadata(); - - $provider_metadata = new ProviderMetadata( - 'mock-provider', - 'Mock Provider', - ProviderTypeEnum::cloud() - ); - - return new class( $metadata, $provider_metadata, $result ) implements ModelInterface, VideoGenerationModelInterface { - - private ModelMetadata $metadata; - private ProviderMetadata $provider_metadata; - private GenerativeAiResult $result; - private ModelConfig $config; - - public function __construct( - ModelMetadata $metadata, - ProviderMetadata $provider_metadata, - GenerativeAiResult $result - ) { - $this->metadata = $metadata; - $this->provider_metadata = $provider_metadata; - $this->result = $result; - $this->config = new ModelConfig(); - } - - public function metadata(): ModelMetadata { - return $this->metadata; - } - - public function providerMetadata(): ProviderMetadata { - return $this->provider_metadata; - } - - public function setConfig( ModelConfig $config ): void { - $this->config = $config; - } - - public function getConfig(): ModelConfig { - return $this->config; - } - - public function generateVideoResult( array $prompt ): GenerativeAiResult { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - return $this->result; - } - }; - } - - /** - * Creates a mock text generation model that throws an exception. - * - * @param Exception $exception The exception to throw from generation. - * @param ModelMetadata|null $metadata Optional metadata. - * @return ModelInterface&TextGenerationModelInterface The mock model. - */ - protected function create_mock_text_generation_model_with_exception( - Exception $exception, - ?ModelMetadata $metadata = null - ): ModelInterface { - $metadata = $metadata ?? $this->create_test_text_model_metadata(); - - $provider_metadata = new ProviderMetadata( - 'mock', - 'Mock Provider', - ProviderTypeEnum::cloud() - ); - - return new class( $metadata, $provider_metadata, $exception ) implements ModelInterface, TextGenerationModelInterface { - - private ModelMetadata $metadata; - private ProviderMetadata $provider_metadata; - private Exception $exception; - private ModelConfig $config; - - public function __construct( - ModelMetadata $metadata, - ProviderMetadata $provider_metadata, - Exception $exception - ) { - $this->metadata = $metadata; - $this->provider_metadata = $provider_metadata; - $this->exception = $exception; - $this->config = new ModelConfig(); - } - - public function metadata(): ModelMetadata { - return $this->metadata; - } - - public function providerMetadata(): ProviderMetadata { - return $this->provider_metadata; - } - - public function setConfig( ModelConfig $config ): void { - $this->config = $config; - } - - public function getConfig(): ModelConfig { - return $this->config; - } - - public function generateTextResult( array $prompt ): GenerativeAiResult { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - throw $this->exception; - } - - public function streamGenerateTextResult( array $prompt ): Generator { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter - throw $this->exception; - } - }; - } -} diff --git a/tests/phpunit/includes/wp-ai-client-mock-provider-trait.php b/tests/phpunit/includes/wp-ai-client-mock-provider-trait.php deleted file mode 100644 index e7637bf239119..0000000000000 --- a/tests/phpunit/includes/wp-ai-client-mock-provider-trait.php +++ /dev/null @@ -1,202 +0,0 @@ -hasProvider( 'mock_connectors_test' ) ) { - $ai_registry->registerProvider( Mock_Connectors_Test_Provider::class ); - } - - // Also register in the WP connector registry if not already present. - $connector_registry = WP_Connector_Registry::get_instance(); - if ( null !== $connector_registry && ! $connector_registry->is_registered( 'mock_connectors_test' ) ) { - $connector_registry->register( - 'mock_connectors_test', - array( - 'name' => 'Mock Connectors Test', - 'description' => '', - 'type' => 'ai_provider', - 'authentication' => array( - 'method' => 'api_key', - 'credentials_url' => null, - ), - ) - ); - } - } - - /** - * Sets whether the mock provider reports as configured. - * - * @param bool $is_configured Whether the provider should be configured. - */ - private static function set_mock_provider_configured( bool $is_configured ): void { - Mock_Connectors_Test_Provider_Availability::$is_configured = $is_configured; - } - - /** - * Unregisters the mock provider's connector setting. - * - * Reverses the side effect of _wp_register_default_connector_settings() - * for the mock provider so that subsequent test classes start with a clean slate. - * Must be called from tear_down_after_class() after running tests. - */ - private static function unregister_mock_connector_setting(): void { - $setting_name = 'connectors_ai_mock_connectors_test_api_key'; - unregister_setting( 'connectors', $setting_name ); - remove_filter( "option_{$setting_name}", '_wp_connectors_mask_api_key' ); - } -} diff --git a/tests/phpunit/includes/wp-ai-client-test-abilities-trait.php b/tests/phpunit/includes/wp-ai-client-test-abilities-trait.php deleted file mode 100644 index 47f5f7725a14c..0000000000000 --- a/tests/phpunit/includes/wp-ai-client-test-abilities-trait.php +++ /dev/null @@ -1,136 +0,0 @@ -is_registered( 'wpaiclienttests' ) ) { - return; - } - - global $wp_current_filter; - - // Simulate the init hook for ability categories. - $wp_current_filter[] = 'wp_abilities_api_categories_init'; - - // Register test ability category. - wp_register_ability_category( - 'wpaiclienttests', - array( - 'label' => 'WP AI Client Tests', - 'description' => 'Test abilities for WP AI Client.', - ) - ); - - array_pop( $wp_current_filter ); - - // Simulate the abilities init action. - $wp_current_filter[] = 'wp_abilities_api_init'; - - // Register test abilities. - wp_register_ability( - 'wpaiclienttests/simple', - array( - 'label' => 'Simple Test Ability', - 'description' => 'A simple test ability with no parameters.', - 'category' => 'wpaiclienttests', - 'execute_callback' => static function () { - return array( 'success' => true ); - }, - 'permission_callback' => static function () { - return true; - }, - ) - ); - - wp_register_ability( - 'wpaiclienttests/with-params', - array( - 'label' => 'Test Ability With Parameters', - 'description' => 'A test ability that accepts parameters.', - 'category' => 'wpaiclienttests', - 'input_schema' => array( - 'type' => 'object', - 'properties' => array( - 'title' => array( - 'type' => 'string', - 'description' => 'The title parameter.', - 'required' => true, - ), - ), - 'additionalProperties' => false, - ), - 'execute_callback' => static function ( array $input ) { - return array( - 'success' => true, - 'title' => $input['title'], - ); - }, - 'permission_callback' => static function () { - return true; - }, - ) - ); - - wp_register_ability( - 'wpaiclienttests/returns-error', - array( - 'label' => 'Test Ability That Returns Error', - 'description' => 'A test ability that returns a WP_Error.', - 'category' => 'wpaiclienttests', - 'execute_callback' => static function () { - return new WP_Error( 'test_error', 'This is a test error message.' ); - }, - 'permission_callback' => static function () { - return true; - }, - ) - ); - - wp_register_ability( - 'wpaiclienttests/hyphen-test', - array( - 'label' => 'Test Ability With Hyphens', - 'description' => 'A test ability to verify hyphenated names.', - 'category' => 'wpaiclienttests', - 'execute_callback' => static function () { - return array( 'hyphenated' => true ); - }, - 'permission_callback' => static function () { - return true; - }, - ) - ); - - array_pop( $wp_current_filter ); - } - - /** - * Unregisters test ability category and abilities. - * - * Safe to call multiple times; skips unregistration if already done. - * Must be called from tear_down_after_class() before parent::tear_down_after_class(). - */ - private static function unregister_test_abilities() { - // Unregister test abilities. - wp_unregister_ability( 'wpaiclienttests/simple' ); - wp_unregister_ability( 'wpaiclienttests/with-params' ); - wp_unregister_ability( 'wpaiclienttests/returns-error' ); - wp_unregister_ability( 'wpaiclienttests/hyphen-test' ); - - // Unregister test ability category. - wp_unregister_ability_category( 'wpaiclienttests' ); - } -} diff --git a/tests/phpunit/tests/abilities-api/wpAbilitiesRegistry.php b/tests/phpunit/tests/abilities-api/wpAbilitiesRegistry.php index b9cc58279c118..32479d69e2f8c 100644 --- a/tests/phpunit/tests/abilities-api/wpAbilitiesRegistry.php +++ b/tests/phpunit/tests/abilities-api/wpAbilitiesRegistry.php @@ -136,74 +136,6 @@ public function test_register_invalid_uppercase_characters_in_name() { $this->assertNull( $result ); } - /** - * Should accept ability name with 3 segments (2 slashes). - * - * @ticket 64098 - * - * @covers WP_Abilities_Registry::register - */ - public function test_register_valid_name_with_three_segments() { - $result = $this->registry->register( 'test/sub/add-numbers', self::$test_ability_args ); - $this->assertInstanceOf( WP_Ability::class, $result ); - $this->assertSame( 'test/sub/add-numbers', $result->get_name() ); - } - - /** - * Should accept ability name with 4 segments (3 slashes). - * - * @ticket 64098 - * - * @covers WP_Abilities_Registry::register - */ - public function test_register_valid_name_with_four_segments() { - $result = $this->registry->register( 'test/sub/deep/add-numbers', self::$test_ability_args ); - $this->assertInstanceOf( WP_Ability::class, $result ); - $this->assertSame( 'test/sub/deep/add-numbers', $result->get_name() ); - } - - /** - * Should reject ability name with 5 segments (exceeds maximum of 4). - * - * @ticket 64098 - * - * @covers WP_Abilities_Registry::register - * - * @expectedIncorrectUsage WP_Abilities_Registry::register - */ - public function test_register_invalid_name_with_five_segments() { - $result = $this->registry->register( 'test/a/b/c/too-deep', self::$test_ability_args ); - $this->assertNull( $result ); - } - - /** - * Should reject ability name with empty segments (double slashes). - * - * @ticket 64098 - * - * @covers WP_Abilities_Registry::register - * - * @expectedIncorrectUsage WP_Abilities_Registry::register - */ - public function test_register_invalid_name_with_empty_segment() { - $result = $this->registry->register( 'test//add-numbers', self::$test_ability_args ); - $this->assertNull( $result ); - } - - /** - * Should reject ability name with trailing slash. - * - * @ticket 64098 - * - * @covers WP_Abilities_Registry::register - * - * @expectedIncorrectUsage WP_Abilities_Registry::register - */ - public function test_register_invalid_name_with_trailing_slash() { - $result = $this->registry->register( 'test/add-numbers/', self::$test_ability_args ); - $this->assertNull( $result ); - } - /** * Should reject ability registration without a label. * diff --git a/tests/phpunit/tests/admin/includesScreen.php b/tests/phpunit/tests/admin/includesScreen.php index 26186391f261d..4b4ba86c5c7d6 100644 --- a/tests/phpunit/tests/admin/includesScreen.php +++ b/tests/phpunit/tests/admin/includesScreen.php @@ -451,19 +451,6 @@ public function test_options() { $this->assertSame( $screen->get_options(), array() ); } - /** - * @ticket 62562 - */ - public function test_get_current_screen_type() { - global $current_screen; - - set_current_screen( 'edit.php' ); - $this->assertInstanceOf( 'WP_Screen', get_current_screen() ); - - $current_screen = new stdClass(); - $this->assertNull( get_current_screen() ); - } - public function test_in_admin() { set_current_screen( 'edit.php' ); $this->assertTrue( get_current_screen()->in_admin() ); diff --git a/tests/phpunit/tests/admin/includesTemplate.php b/tests/phpunit/tests/admin/includesTemplate.php index 15a5edd672f09..909aff217a583 100644 --- a/tests/phpunit/tests/admin/includesTemplate.php +++ b/tests/phpunit/tests/admin/includesTemplate.php @@ -494,20 +494,4 @@ public function test_wp_add_dashboard_widget() { // This doesn't actually get removed due to the invalid priority. remove_meta_box( 'dashboard2', 'dashboard', 'normal' ); } - - /** - * Tests that get_post_states() handles a null value gracefully. - * - * This can happen when get_post() returns null (e.g., when a post - * doesn't exist) and that result is passed to get_post_states() - * without being checked first. - * - * @ticket 58932 - * - * @covers ::get_post_states - */ - public function test_get_post_states_with_null_returns_empty_array() { - $result = get_post_states( null ); - $this->assertSame( array(), $result, 'get_post_states() should return an empty array when WP_Post is not supplied.' ); - } } diff --git a/tests/phpunit/tests/admin/wpCommentsListTable.php b/tests/phpunit/tests/admin/wpCommentsListTable.php index 185bc5bfa48b0..ed1d3a83bfb38 100644 --- a/tests/phpunit/tests/admin/wpCommentsListTable.php +++ b/tests/phpunit/tests/admin/wpCommentsListTable.php @@ -218,61 +218,30 @@ public function test_get_views_should_return_views_by_default() { * Verify that the comments table never shows the note comment_type. * * @ticket 64198 - * @ticket 64474 - * - * @dataProvider data_comment_type - * - * @param string $comment_type The comment_type parameter value to test. */ - public function test_comments_list_table_does_not_show_note_comment_type( string $comment_type ) { - $post_id = self::factory()->post->create(); - self::factory()->comment->create( + public function test_comments_list_table_does_not_show_note_comment_type() { + $post_id = self::factory()->post->create(); + $note_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id, 'comment_content' => 'This is a note.', 'comment_type' => 'note', 'comment_approved' => '1', - 'comment_date' => '2024-01-01 10:00:00', - 'comment_date_gmt' => '2024-01-01 10:00:00', ) ); - $regular_comment_id = self::factory()->comment->create( + $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id, 'comment_content' => 'This is a regular comment.', 'comment_type' => '', 'comment_approved' => '1', - 'comment_date' => '2024-01-01 11:00:00', - 'comment_date_gmt' => '2024-01-01 11:00:00', - ) - ); - $pingback_comment_id = self::factory()->comment->create( - array( - 'comment_post_ID' => $post_id, - 'comment_content' => 'This is a pingback comment.', - 'comment_type' => '', - 'comment_approved' => '1', - 'comment_date' => '2024-01-01 12:00:00', - 'comment_date_gmt' => '2024-01-01 12:00:00', ) ); - $_REQUEST['comment_type'] = $comment_type; + // Request the note comment type. + $_REQUEST['comment_type'] = 'note'; $this->table->prepare_items(); $items = $this->table->items; - $this->assertCount( 2, $items ); - $this->assertEquals( $pingback_comment_id, $items[0]->comment_ID ); - $this->assertEquals( $regular_comment_id, $items[1]->comment_ID ); - } - - /** - * Data provider for test_comments_list_table_does_not_show_note_comment_type(). - * - * @return array
Fallback value
' ); $this->assertSame( - 'Custom field value
', + 'Custom field value
', $content, 'The post content should show the value of the custom field . ' ); @@ -123,7 +123,7 @@ public function test_custom_field_value_is_not_shown_in_password_protected_posts remove_filter( 'post_password_required', '__return_true' ); $this->assertSame( - 'Fallback value
', + 'Fallback value
', $content, 'The post content should show the fallback value instead of the custom field value.' ); @@ -153,7 +153,7 @@ public function test_custom_field_value_is_not_shown_in_non_viewable_posts() { remove_filter( 'is_post_status_viewable', '__return_false' ); $this->assertSame( - 'Fallback value
', + 'Fallback value
', $content, 'The post content should show the fallback value instead of the custom field value.' ); @@ -168,7 +168,7 @@ public function test_binding_to_non_existing_meta_key() { $content = $this->get_modified_post_content( 'Fallback value
' ); $this->assertSame( - 'Fallback value
', + 'Fallback value
', $content, 'The post content should show the fallback value.' ); @@ -183,7 +183,7 @@ public function test_binding_without_key_renders_the_fallback() { $content = $this->get_modified_post_content( 'Fallback value
' ); $this->assertSame( - 'Fallback value
', + 'Fallback value
', $content, 'The post content should show the fallback value.' ); @@ -209,7 +209,7 @@ public function test_protected_field_value_is_not_shown() { $content = $this->get_modified_post_content( 'Fallback value
' ); $this->assertSame( - 'Fallback value
', + 'Fallback value
', $content, 'The post content should show the fallback value instead of the protected value.' ); @@ -235,7 +235,7 @@ public function test_custom_field_not_exposed_in_rest_api_is_not_shown() { $content = $this->get_modified_post_content( 'Fallback value
' ); $this->assertSame( - 'Fallback value
', + 'Fallback value
', $content, 'The post content should show the fallback value instead of the protected value.' ); @@ -261,7 +261,7 @@ public function test_custom_field_with_unsafe_html_is_sanitized() { $content = $this->get_modified_post_content( 'Fallback value
' ); $this->assertSame( - 'alert(“Unsafe HTML”)
', + 'alert(“Unsafe HTML”)
', $content, 'The post content should not include the script tag.' ); @@ -298,7 +298,7 @@ public function test_filter_block_bindings_source_value() { remove_filter( 'block_bindings_source_value', $filter_value ); $this->assertSame( - 'Filtered value: tests_filter_field
', + 'Filtered value: tests_filter_field
', $content, 'The post content should show the filtered value.' ); diff --git a/tests/phpunit/tests/block-bindings/render.php b/tests/phpunit/tests/block-bindings/render.php index 77b0975105dc5..fa8178cbd39b2 100644 --- a/tests/phpunit/tests/block-bindings/render.php +++ b/tests/phpunit/tests/block-bindings/render.php @@ -90,7 +90,7 @@ public function data_update_block_with_value_from_source() { HTML , - 'test source value
', + 'test source value
', ), 'button block' => array( 'text', @@ -179,19 +179,19 @@ function ( $source_args, $block_instance, $attribute_name ) { $value = $source_args['key']; return "The attribute name is '$attribute_name' and its binding has argument 'key' with value '$value'."; }, - "The attribute name is 'content' and its binding has argument 'key' with value 'test'.
", + "The attribute name is 'content' and its binding has argument 'key' with value 'test'.
", ), 'unsafe HTML should be sanitized' => array( function () { return ''; }, - 'alert("Unsafe HTML")
', + 'alert("Unsafe HTML")
', ), 'symbols and numbers should be rendered correctly' => array( function () { return '$12.50'; }, - '$12.50
', + '$12.50
', ), ); } @@ -418,7 +418,7 @@ public function test_filter_block_bindings_source_value() { remove_filter( 'block_bindings_source_value', $filter_value ); $this->assertSame( - 'Filtered value: test_arg. Block instance: core/paragraph. Attribute name: content.
', + 'Filtered value: test_arg. Block instance: core/paragraph. Attribute name: content.
', trim( $result ), 'The block content should show the filtered value.' ); diff --git a/tests/phpunit/tests/block-processor/wpBlockProcessor.php b/tests/phpunit/tests/block-processor/wpBlockProcessor.php index 6f8934e003030..682307a88f28c 100644 --- a/tests/phpunit/tests/block-processor/wpBlockProcessor.php +++ b/tests/phpunit/tests/block-processor/wpBlockProcessor.php @@ -747,46 +747,6 @@ public function test_reports_if_block_is_of_type( $html, $block_type ) { } } - /** - * Verifies that innerHTML only matches as a block type when checking with the wildcard '*'. - * - * @ticket 64485 - * - * @covers ::is_block_type() - */ - public function test_inner_html_is_only_a_block_type_match_with_the_wildcard() { - $processor = new WP_Block_Processor( '01' ); - - $processor->next_token(); - $this->assertTrue( - $processor->is_block_type( 'freeform' ), - 'Failed to detect top-level freeform HTML as freeform block: check test setup.' - ); - - $processor->next_token(); - $this->assertTrue( - $processor->is_block_type( 'b1' ), - 'Failed to detect opening delimiter as b1 block type: check test setup.' - ); - - $processor->next_token(); - $this->assertFalse( - ( - $processor->is_block_type( 'freeform' ) || - $processor->is_block_type( 'b1' ) || - $processor->is_block_type( 'core/freeform' ) || - $processor->is_block_type( 'core/b1' ) || - $processor->is_block_type( '' ) - ), - 'Failed to reject innerHTML as a matched block type.' - ); - - $this->assertTrue( - $processor->is_block_type( '*' ), - 'Failed to accept innerHTML as a wildcard block-type match.' - ); - } - /** * Verifies that the processor indicates if the currently-matched delimiter * opens a block of a given block type. This is true for openers and void delimiters. @@ -1251,191 +1211,6 @@ public static function data_content_and_delimiter_spans() { ); } - /** - * Verifies that next_block( $block_type ) scans directly to the appropriate tokens. - * - * @ticket 64485 - * - * @dataProvider data_markup_with_block_of_given_type - * - * @param string $html Contains block markup, including the tested block type. - * @param string $block_type Jump to this block type. - */ - public function test_scans_directly_to_requested_block_type( string $html, string $block_type ) { - $processor = new WP_Block_Processor( $html ); - - $this->assertTrue( - $processor->next_block( $block_type ), - 'Failed to find block of requested type.' - ); - - $full_block_type = WP_Block_Processor::normalize_block_type( $block_type ); - - if ( 'core/freeform' === $full_block_type ) { - $this->assertTrue( - $processor->is_html(), - 'Failed to match on HTML token when looking for freeform content.' - ); - - $this->assertSame( - 0, - $processor->get_depth(), - 'Failed to scan to top-level freeform content when searching for freeform.' - ); - } else { - $this->assertFalse( - $processor->is_html(), - 'Matched on HTML token when looking for block delimiter.' - ); - } - - $this->assertSame( - $full_block_type, - $processor->get_printable_block_type(), - 'Scanned to token of wrong block type.' - ); - } - - /** - * Ensures that block extraction matches the behavior of the default block parser. - * - * @ticket 64537 - * - * @dataProvider data_various_block_posts - * - * @param string $test_document An HTML document to parse as blocks. - */ - public function test_extracts_equivalent_parses_as_parse_blocks( string $test_document ) { - $processor = new WP_Block_Processor( $test_document ); - $blocks = array(); - - while ( $processor->next_block( '*' ) ) { - $blocks[] = $processor->extract_full_block_and_advance(); - } - - $this->assertSame( - parse_blocks( $test_document ), - $blocks, - 'Failed to properly parse the block structure.' - ); - } - - /** - * Data provider. - * - * @return Generator - */ - public static function data_various_block_posts() { - yield 'Empty post' => array( '' ); - - yield 'Void block' => array( '' ); - - yield 'Empty block' => array( '' ); - - yield 'Paragraph block' => array( 'Test
' ); - - yield 'Paragraph block with attributes' => array( - 'Test
', - ); - - yield 'Group with void inner' => array( - '', - ); - - /* - * @todo There is a hidden bug in here, which is possibly a problem in - * the default parser. There are HTML spans of newlines between - * these block delimiters, and without them, the parse doesn’t - * match `parse_blocks()`. However, `parse_blocks()` is inconsistent - * in its behavior. Whereas it produces an empty text chunk here, - * in the case of a void inner block it produces none. The test is - * being adjusted to step around this issue so that it can be resolved - * separately, and until it’s clear if there is an implementation issue - * with `parse_blocks()` itself. - */ - yield 'Empty columns' => array( - << - - - -HTML - , - ); - - yield 'Contentful columns' => array( - << --
-
-
- A good point. - -
-
-
-HTML
- ,
- );
-
- yield 'Nested blocks' => array(
- <<
- Test
- This is freeform. - - End - - - - -
-
-
-
-
-
-HTML
- ,
- );
-
- yield 'Attributes on nested blocks' => array(
- <<
-
-
-
-
-
-
-
-HTML
- ,
- );
- }
-
- /**
- * Data provider.
- *
- * @return array[]
- */
- public static function data_markup_with_block_of_given_type() {
- return array(
- 'At start of HTML' => array( '', 'target' ),
- 'After freeform text' => array( 'prefix', 'target' ),
- 'After outer block' => array( 'prefix', 'target' ),
- 'After innerHTML' => array( 'prefixinner', 'target' ),
- );
- }
-
//
// Test helpers.
//
diff --git a/tests/phpunit/tests/block-supports/aria-label.php b/tests/phpunit/tests/block-supports/aria-label.php
index 93666ba0fb493..087f4843cebb0 100644
--- a/tests/phpunit/tests/block-supports/aria-label.php
+++ b/tests/phpunit/tests/block-supports/aria-label.php
@@ -44,16 +44,15 @@ private function register_aria_label_block_with_support( $block_name, $supports
}
/**
- * Tests that aria-label block support works as expected.
+ * Tests that position block support works as expected.
*
* @ticket 62919
- * @ticket 64594
*
* @dataProvider data_aria_label_block_support
*
* @param boolean|array $support Aria label block support configuration.
* @param string $value Aria label value for attribute object.
- * @param array $expected Expected aria-label attributes.
+ * @param array $expected Expected aria label block support styles.
*/
public function test_wp_apply_aria_label_support( $support, $value, $expected ) {
$block_type = self::register_aria_label_block_with_support(
@@ -83,13 +82,6 @@ public function data_aria_label_block_support() {
'value' => 'Label',
'expected' => array(),
),
- 'aria-label attribute is not applied when serialization is skipped' => array(
- 'support' => array(
- '__experimentalSkipSerialization' => true,
- ),
- 'value' => 'Label',
- 'expected' => array(),
- ),
);
}
}
diff --git a/tests/phpunit/tests/block-supports/auto-register.php b/tests/phpunit/tests/block-supports/auto-register.php
deleted file mode 100644
index 71754f247225b..0000000000000
--- a/tests/phpunit/tests/block-supports/auto-register.php
+++ /dev/null
@@ -1,144 +0,0 @@
- array( 'autoRegister' => true ),
- 'attributes' => array(
- 'title' => array( 'type' => 'string' ),
- 'count' => array( 'type' => 'integer' ),
- ),
- );
-
- $result = wp_mark_auto_generate_control_attributes( $settings );
-
- $this->assertTrue( $result['attributes']['title']['autoGenerateControl'] );
- $this->assertTrue( $result['attributes']['count']['autoGenerateControl'] );
- }
-
- /**
- * Tests that attributes are not marked without autoRegister flag.
- *
- * @ticket 64639
- */
- public function test_does_not_mark_attributes_without_auto_register() {
- $settings = array(
- 'attributes' => array(
- 'title' => array( 'type' => 'string' ),
- ),
- );
-
- $result = wp_mark_auto_generate_control_attributes( $settings );
-
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['title'] );
- }
-
- /**
- * Tests that attributes with source are excluded.
- *
- * @ticket 64639
- */
- public function test_excludes_attributes_with_source() {
- $settings = array(
- 'supports' => array( 'autoRegister' => true ),
- 'attributes' => array(
- 'title' => array( 'type' => 'string' ),
- 'content' => array(
- 'type' => 'string',
- 'source' => 'html',
- ),
- ),
- );
-
- $result = wp_mark_auto_generate_control_attributes( $settings );
-
- $this->assertTrue( $result['attributes']['title']['autoGenerateControl'] );
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['content'] );
- }
-
- /**
- * Tests that attributes with role: local are excluded.
- *
- * Example: The 'blob' attribute in media blocks (image, video, file, audio)
- * stores a temporary blob URL during file upload. This is internal state
- * that shouldn't be shown in the inspector or saved to the database.
- *
- * @ticket 64639
- */
- public function test_excludes_attributes_with_role_local() {
- $settings = array(
- 'supports' => array( 'autoRegister' => true ),
- 'attributes' => array(
- 'title' => array( 'type' => 'string' ),
- 'blob' => array(
- 'type' => 'string',
- 'role' => 'local',
- ),
- ),
- );
-
- $result = wp_mark_auto_generate_control_attributes( $settings );
-
- $this->assertTrue( $result['attributes']['title']['autoGenerateControl'] );
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['blob'] );
- }
-
- /**
- * Tests that empty attributes are handled gracefully.
- *
- * @ticket 64639
- */
- public function test_handles_empty_attributes() {
- $settings = array(
- 'supports' => array( 'autoRegister' => true ),
- );
-
- $result = wp_mark_auto_generate_control_attributes( $settings );
-
- $this->assertSame( $settings, $result );
- }
-
- /**
- * Tests that only allowed attributes are marked.
- *
- * @ticket 64639
- */
- public function test_excludes_unsupported_types() {
- $settings = array(
- 'supports' => array( 'autoRegister' => true ),
- 'attributes' => array(
- // Supported types
- 'text' => array( 'type' => 'string' ),
- 'price' => array( 'type' => 'number' ),
- 'count' => array( 'type' => 'integer' ),
- 'enabled' => array( 'type' => 'boolean' ),
- // Unsupported types
- 'metadata' => array( 'type' => 'object' ),
- 'items' => array( 'type' => 'array' ),
- 'config' => array( 'type' => 'null' ),
- 'unknown' => array( 'type' => 'unknown' ),
- ),
- );
-
- $result = wp_mark_auto_generate_control_attributes( $settings );
-
- $this->assertTrue( $result['attributes']['text']['autoGenerateControl'] );
- $this->assertTrue( $result['attributes']['price']['autoGenerateControl'] );
- $this->assertTrue( $result['attributes']['count']['autoGenerateControl'] );
- $this->assertTrue( $result['attributes']['enabled']['autoGenerateControl'] );
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['metadata'] );
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['items'] );
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['config'] );
- $this->assertArrayNotHasKey( 'autoGenerateControl', $result['attributes']['unknown'] );
- }
-}
diff --git a/tests/phpunit/tests/block-supports/block-visibility.php b/tests/phpunit/tests/block-supports/block-visibility.php
index 4f24b931744f8..b73e8a1ede09e 100644
--- a/tests/phpunit/tests/block-supports/block-visibility.php
+++ b/tests/phpunit/tests/block-supports/block-visibility.php
@@ -11,18 +11,18 @@
* @covers ::wp_render_block_visibility_support
*/
class Tests_Block_Supports_Block_Visibility extends WP_UnitTestCase {
+ /**
+ * @var string|null
+ */
+ private $test_block_name;
- private ?string $test_block_name;
-
- public function set_up(): void {
+ public function set_up() {
parent::set_up();
$this->test_block_name = null;
}
- public function tear_down(): void {
- if ( $this->test_block_name ) {
- unregister_block_type( $this->test_block_name );
- }
+ public function tear_down() {
+ unregister_block_type( $this->test_block_name );
$this->test_block_name = null;
parent::tear_down();
}
@@ -30,10 +30,12 @@ public function tear_down(): void {
/**
* Registers a new block for testing block visibility support.
*
- * @param string $block_name Name for the test block.
- * @param arrayTest content 
';
+ $block_content = 'This is a test block.
'; $block = array( 'blockName' => 'test/visibility-block', 'attrs' => array( @@ -105,338 +107,4 @@ public function test_block_visibility_support_shows_block_when_support_not_opted $this->assertSame( $block_content, $result, 'Block content should remain unchanged when blockVisibility support is not opted in.' ); } - - /** - * @ticket 64414 - */ - public function test_block_visibility_support_no_visibility_attribute(): void { - $this->register_visibility_block_with_support( - 'test/block-visibility-none', - array( 'visibility' => true ) - ); - - $block = array( - 'blockName' => 'test/block-visibility-none', - 'attrs' => array(), - ); - - $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertSame( $block_content, $result, 'Block content should remain unchanged when no visibility attribute is present.' );
- }
-
- /**
- * @ticket 64414
- */
- public function test_block_visibility_support_generated_css_with_mobile_viewport_size(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-mobile',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-mobile',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'mobile' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertStringContainsString( 'wp-block-hidden-mobile', $result, 'Block should have the visibility class for the mobile breakpoint.' );
-
- $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
-
- $this->assertSame(
- '@media (width <= 480px){.wp-block-hidden-mobile{display:none !important;}}',
- $actual_stylesheet,
- 'CSS should contain mobile visibility rule'
- );
- }
-
- /**
- * @ticket 64414
- */
- public function test_block_visibility_support_generated_css_with_tablet_viewport_size(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-tablet',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-tablet',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'tablet' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertEqualHTML(
- 'Test content
',
- $result,
- '',
- 'Block should have the existing class and the visibility class for the tablet breakpoint in the class attribute.'
- );
-
- $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
-
- $this->assertSame(
- '@media (480px < width <= 782px){.wp-block-hidden-tablet{display:none !important;}}',
- $actual_stylesheet,
- 'CSS should contain tablet visibility rule'
- );
- }
-
- /**
- * @ticket 64414
- */
- public function test_block_visibility_support_generated_css_with_desktop_breakpoint(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-desktop',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-desktop',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'desktop' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertEqualHTML(
- 'Test content
',
- $result,
- '',
- 'Block should have the visibility class for the desktop breakpoint in the class attribute.'
- );
-
- $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
-
- $this->assertSame(
- '@media (width > 782px){.wp-block-hidden-desktop{display:none !important;}}',
- $actual_stylesheet,
- 'CSS should contain desktop visibility rule'
- );
- }
-
- /**
- * @ticket 64414
- * @ticket 64823
- */
- public function test_block_visibility_support_generated_css_with_two_viewport_sizes(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-two',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-two',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'mobile' => false,
- 'desktop' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertEqualHTML(
- 'Test content
',
- $result,
- '',
- 'Block should have both visibility classes in the class attribute, and the IMG should have fetchpriority=auto.'
- );
-
- $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
-
- $this->assertSame(
- '@media (width > 782px){.wp-block-hidden-desktop{display:none !important;}}@media (width <= 480px){.wp-block-hidden-mobile{display:none !important;}}',
- $actual_stylesheet,
- 'CSS should contain desktop and mobile visibility rules'
- );
- }
-
- /**
- * @ticket 64414
- * @ticket 64823
- */
- public function test_block_visibility_support_generated_css_with_all_viewport_sizes_visible(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-all-visible',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-all-visible',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'mobile' => true,
- 'tablet' => true,
- 'desktop' => true,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertSame( $block_content, $result, 'Block content should remain unchanged when all breakpoints are visible.' );
- }
-
- /**
- * @ticket 64414
- * @ticket 64823
- */
- public function test_block_visibility_support_generated_css_with_all_viewport_sizes_hidden(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-all-hidden',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-all-hidden',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'mobile' => false,
- 'tablet' => false,
- 'desktop' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertEqualHTML(
- 'Test content
',
- $result,
- '',
- 'Block content should have the visibility classes for all viewport sizes in the class attribute, and an IMG should get fetchpriority=auto.'
- );
- }
-
- /**
- * @ticket 64414
- */
- public function test_block_visibility_support_generated_css_with_empty_object(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-empty',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-empty',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertSame( $block_content, $result, 'Block content should remain unchanged when blockVisibility is an empty array.' );
- }
-
- /**
- * @ticket 64414
- */
- public function test_block_visibility_support_generated_css_with_unknown_viewport_sizes_ignored(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-unknown-viewport-sizes',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-unknown-viewport-sizes',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'mobile' => false,
- 'unknownBreak' => false,
- 'largeScreen' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = 'Test content
';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertStringContainsString(
- 'class="wp-block-hidden-mobile"',
- $result,
- 'Block should have the visibility class for the mobile breakpoint in the class attribute'
- );
- }
-
- /**
- * @ticket 64414
- */
- public function test_block_visibility_support_generated_css_with_empty_content(): void {
- $this->register_visibility_block_with_support(
- 'test/viewport-empty-content',
- array( 'visibility' => true )
- );
-
- $block = array(
- 'blockName' => 'test/viewport-empty-content',
- 'attrs' => array(
- 'metadata' => array(
- 'blockVisibility' => array(
- 'viewport' => array(
- 'mobile' => false,
- ),
- ),
- ),
- ),
- );
-
- $block_content = '';
- $result = wp_render_block_visibility_support( $block_content, $block );
-
- $this->assertSame( '', $result, 'Block content should be empty when there is no content.' );
- }
}
diff --git a/tests/phpunit/tests/block-supports/duotone.php b/tests/phpunit/tests/block-supports/duotone.php
index 808903a072452..1f60a8247d4c4 100644
--- a/tests/phpunit/tests/block-supports/duotone.php
+++ b/tests/phpunit/tests/block-supports/duotone.php
@@ -93,8 +93,6 @@ public function data_get_slug_from_attribute() {
'pipe-slug-no-value' => array( 'var:preset|duotone|', '' ),
'css-var-spaces' => array( 'var(--wp--preset--duotone-- ', '' ),
'pipe-slug-spaces' => array( 'var:preset|duotone| ', '' ),
- 'array-of-colors' => array( array( '#000000', '#ffffff' ), '' ),
- 'empty-array' => array( array(), '' ),
);
}
@@ -166,8 +164,6 @@ public function data_is_preset() {
'css-var-invalid-slug-chars' => array( 'var(--wp--preset--duotone--.)', false ),
'css-var-missing-end-parenthesis' => array( 'var(--wp--preset--duotone--blue-orange', false ),
'invalid' => array( 'not a valid attribute', false ),
- 'array-of-colors' => array( array( '#000000', '#ffffff' ), false ),
- 'empty-array' => array( array(), false ),
);
}
diff --git a/tests/phpunit/tests/block-supports/layout.php b/tests/phpunit/tests/block-supports/layout.php
index f47a7a3e35d2b..3b71b2c4b7482 100644
--- a/tests/phpunit/tests/block-supports/layout.php
+++ b/tests/phpunit/tests/block-supports/layout.php
@@ -42,22 +42,6 @@ public function set_up() {
// Clear caches.
wp_clean_themes_cache();
unset( $GLOBALS['wp_themes'] );
-
- /*
- * Register a style variation with a custom blockGap value for testing.
- */
- register_block_style(
- 'core/group',
- array(
- 'name' => 'custom-gap',
- 'label' => 'Custom Gap',
- 'style_data' => array(
- 'spacing' => array(
- 'blockGap' => '99px',
- ),
- ),
- )
- );
}
public function tear_down() {
@@ -70,11 +54,6 @@ public function tear_down() {
wp_clean_themes_cache();
unset( $GLOBALS['wp_themes'] );
-
- // Clean up variation test data.
- unregister_block_style( 'core/group', 'custom-gap' );
- WP_Theme_JSON_Resolver::clean_cached_data();
-
parent::tear_down();
}
@@ -314,7 +293,7 @@ public function data_layout_support_flag_renders_classnames_on_wrapper() {
),
),
),
- 'expected_output' => '',
+ 'expected_output' => '',
),
'single wrapper block layout with grid type' => array(
'args' => array(
@@ -333,7 +312,7 @@ public function data_layout_support_flag_renders_classnames_on_wrapper() {
),
),
),
- 'expected_output' => '',
+ 'expected_output' => '',
),
'skip classname output if block does not support layout and there are no child layout classes to be output' => array(
'args' => array(
@@ -563,19 +542,9 @@ public function test_layout_support_flag_renders_consistent_container_hash( $blo
$processor = new WP_HTML_Tag_Processor( $output );
$processor->next_tag();
- // Extract the actual container class from the output for better error messages.
- $actual_class = '';
- foreach ( $processor->class_list() as $class_name ) {
- if ( str_starts_with( $class_name, 'wp-container-core-group-is-layout-' ) ) {
- $actual_class = $class_name;
- break;
- }
- }
-
- $this->assertEquals(
- $expected_class,
- $actual_class,
- 'Expected class not found in the rendered output, probably because of a different hash.'
+ $this->assertTrue(
+ $processor->has_class( $expected_class ),
+ "Expected class '$expected_class' not found in the rendered output, probably because of a different hash."
);
}
@@ -597,7 +566,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
),
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-a6248535',
+ 'expected_class' => 'wp-container-core-group-is-layout-c5c7d83f',
),
'default type block gap 24px' => array(
'block_attributes' => array(
@@ -610,7 +579,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
),
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-61b496ee',
+ 'expected_class' => 'wp-container-core-group-is-layout-634f0b9d',
),
'constrained type justified left' => array(
'block_attributes' => array(
@@ -619,7 +588,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
'justifyContent' => 'left',
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-54d22900',
+ 'expected_class' => 'wp-container-core-group-is-layout-12dd3699',
),
'constrained type justified right' => array(
'block_attributes' => array(
@@ -628,7 +597,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
'justifyContent' => 'right',
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-2910ada7',
+ 'expected_class' => 'wp-container-core-group-is-layout-f1f2ed93',
),
'flex type horizontal' => array(
'block_attributes' => array(
@@ -638,7 +607,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
'flexWrap' => 'nowrap',
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-f5d79bea',
+ 'expected_class' => 'wp-container-core-group-is-layout-2487dcaa',
),
'flex type vertical' => array(
'block_attributes' => array(
@@ -647,7 +616,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
'orientation' => 'vertical',
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-2c90304e',
+ 'expected_class' => 'wp-container-core-group-is-layout-fe9cc265',
),
'grid type' => array(
'block_attributes' => array(
@@ -655,7 +624,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
'type' => 'grid',
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-5a23bf8e',
+ 'expected_class' => 'wp-container-core-group-is-layout-478b6e6b',
),
'grid type 3 columns' => array(
'block_attributes' => array(
@@ -664,7 +633,7 @@ public function data_layout_support_flag_renders_consistent_container_hash() {
'columnCount' => 3,
),
),
- 'expected_class' => 'wp-container-core-group-is-layout-cda6dc4f',
+ 'expected_class' => 'wp-container-core-group-is-layout-d3b710ac',
),
);
}
@@ -748,131 +717,4 @@ public function data_layout_classname_with_custom_blocks() {
),
);
}
-
- /**
- * Tests that block style variations with blockGap values are applied to layout styles.
- *
- * @ticket 64624
- * @covers ::wp_render_layout_support_flag
- */
- public function test_layout_support_flag_uses_variation_block_gap_value() {
- switch_theme( 'block-theme' );
-
- $block_content = '';
- $block = array(
- 'blockName' => 'core/group',
- 'attrs' => array(
- 'className' => 'is-style-custom-gap',
- 'layout' => array(
- 'type' => 'grid',
- 'columnCount' => 3,
- 'minimumColumnWidth' => '12rem',
- ),
- ),
- 'innerBlocks' => array(),
- 'innerHTML' => '',
- 'innerContent' => array(
- '',
- ),
- );
-
- wp_render_layout_support_flag( $block_content, $block );
-
- // Get the generated CSS from the style engine.
- $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
-
- // The CSS grid declaration should contain the variation's blockGap value of 99px.
- $this->assertStringContainsString(
- 'grid-template-columns:repeat(auto-fill, minmax(max(min(12rem, 100%), (100% - (99px * (3 - 1))) /3), 1fr))',
- $actual_stylesheet,
- 'Generated CSS should contain the variation blockGap value of 99px.'
- );
- }
-
- /**
- * Tests that wp_get_block_style_variation_name_from_registered_style correctly extracts variation names from class strings.
- *
- * @ticket 64624
- * @covers ::wp_get_block_style_variation_name_from_registered_style
- *
- * @dataProvider data_get_block_style_variation_name_from_registered_style
- *
- * @param string $class_name CSS class string to test.
- * @param array $registered_styles Registered block styles.
- * @param string|null $expected_result Expected variation name or null.
- */
- public function test_get_block_style_variation_name_from_registered_style( $class_name, $registered_styles, $expected_result ) {
- $result = wp_get_block_style_variation_name_from_registered_style( $class_name, $registered_styles );
- $this->assertSame( $expected_result, $result );
- }
-
- /**
- * Data provider for test_get_block_style_variation_name_from_registered_style.
- *
- * @return array
- */
- public function data_get_block_style_variation_name_from_registered_style() {
- return array(
- 'empty class name' => array(
- 'class_name' => '',
- 'registered_styles' => array(),
- 'expected_result' => null,
- ),
- 'no matching registered styles' => array(
- 'class_name' => 'is-style-shadowed wp-block-button',
- 'registered_styles' => array(
- array( 'name' => 'rounded' ),
- array( 'name' => 'outlined' ),
- ),
- 'expected_result' => null,
- ),
- 'single matching variation found' => array(
- 'class_name' => 'wp-block-button is-style-rounded',
- 'registered_styles' => array(
- array( 'name' => 'rounded' ),
- array( 'name' => 'outlined' ),
- ),
- 'expected_result' => 'rounded',
- ),
- 'ignores default style only' => array(
- 'class_name' => 'is-style-default wp-block-button',
- 'registered_styles' => array(
- array( 'name' => 'default' ),
- array( 'name' => 'rounded' ),
- ),
- 'expected_result' => null,
- ),
- 'ignores default and returns next variation' => array(
- 'class_name' => 'is-style-default is-style-rounded wp-block-button',
- 'registered_styles' => array(
- array( 'name' => 'default' ),
- array( 'name' => 'rounded' ),
- array( 'name' => 'outlined' ),
- ),
- 'expected_result' => 'rounded',
- ),
- 'returns first matching variation when multiple present' => array(
- 'class_name' => 'is-style-shadowed is-style-rounded',
- 'registered_styles' => array(
- array( 'name' => 'rounded' ),
- array( 'name' => 'outlined' ),
- array( 'name' => 'shadowed' ),
- ),
- 'expected_result' => 'shadowed',
- ),
- 'empty registered styles array' => array(
- 'class_name' => 'is-style-rounded',
- 'registered_styles' => array(),
- 'expected_result' => null,
- ),
- 'registered styles with missing name property' => array(
- 'class_name' => 'is-style-outlined wp-block-button',
- 'registered_styles' => array(
- array( 'label' => 'Rounded' ),
- array( 'name' => 'outlined' ),
- ),
- 'expected_result' => 'outlined',
- ),
- );
- }
}
diff --git a/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php b/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php
index 897bcd0dd04f5..a4f2973a06934 100644
--- a/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php
+++ b/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php
@@ -100,146 +100,4 @@ public function data_minimum_height_block_support() {
),
);
}
-
- /**
- * Tests that width block support works as expected.
- *
- * @ticket 64200
- *
- * @covers ::wp_apply_dimensions_support
- *
- * @dataProvider data_width_block_support
- *
- * @param string $block_name The test block name to register.
- * @param mixed $dimensions The dimensions block support settings.
- * @param mixed $expected The expected results.
- */
- public function test_width_block_support( $block_name, $dimensions, $expected ) {
- $this->test_block_name = $block_name;
- register_block_type(
- $this->test_block_name,
- array(
- 'api_version' => 2,
- 'attributes' => array(
- 'style' => array(
- 'type' => 'object',
- ),
- ),
- 'supports' => array(
- 'dimensions' => $dimensions,
- ),
- )
- );
- $registry = WP_Block_Type_Registry::get_instance();
- $block_type = $registry->get_registered( $this->test_block_name );
- $block_attrs = array(
- 'style' => array(
- 'dimensions' => array(
- 'width' => '300px',
- ),
- ),
- );
-
- $actual = wp_apply_dimensions_support( $block_type, $block_attrs );
-
- $this->assertSame( $expected, $actual );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_width_block_support() {
- return array(
- 'style is applied' => array(
- 'block_name' => 'test/width-style-is-applied',
- 'dimensions' => array(
- 'width' => true,
- ),
- 'expected' => array(
- 'style' => 'width:300px;',
- ),
- ),
- 'style output is skipped when individual feature serialization is skipped' => array(
- 'block_name' => 'test/width-with-individual-skipped-serialization-block-supports',
- 'dimensions' => array(
- 'width' => true,
- '__experimentalSkipSerialization' => array( 'width' ),
- ),
- 'expected' => array(),
- ),
- );
- }
-
- /**
- * Tests that height block support works as expected.
- *
- * @ticket 64202
- *
- * @covers ::wp_apply_dimensions_support
- *
- * @dataProvider data_height_block_support
- *
- * @param string $block_name The test block name to register.
- * @param mixed $dimensions The dimensions block support settings.
- * @param mixed $expected The expected results.
- */
- public function test_height_block_support( $block_name, $dimensions, $expected ) {
- $this->test_block_name = $block_name;
- register_block_type(
- $this->test_block_name,
- array(
- 'api_version' => 2,
- 'attributes' => array(
- 'style' => array(
- 'type' => 'object',
- ),
- ),
- 'supports' => array(
- 'dimensions' => $dimensions,
- ),
- )
- );
- $registry = WP_Block_Type_Registry::get_instance();
- $block_type = $registry->get_registered( $this->test_block_name );
- $block_attrs = array(
- 'style' => array(
- 'dimensions' => array(
- 'height' => '400px',
- ),
- ),
- );
-
- $actual = wp_apply_dimensions_support( $block_type, $block_attrs );
-
- $this->assertSame( $expected, $actual );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_height_block_support() {
- return array(
- 'style is applied' => array(
- 'block_name' => 'test/height-style-is-applied',
- 'dimensions' => array(
- 'height' => true,
- ),
- 'expected' => array(
- 'style' => 'height:400px;',
- ),
- ),
- 'style output is skipped when individual feature serialization is skipped' => array(
- 'block_name' => 'test/height-with-individual-skipped-serialization-block-supports',
- 'dimensions' => array(
- 'height' => true,
- '__experimentalSkipSerialization' => array( 'height' ),
- ),
- 'expected' => array(),
- ),
- );
- }
}
diff --git a/tests/phpunit/tests/block-supports/wpRenderCustomCssClassName.php b/tests/phpunit/tests/block-supports/wpRenderCustomCssClassName.php
deleted file mode 100644
index 0bcbc6c708468..0000000000000
--- a/tests/phpunit/tests/block-supports/wpRenderCustomCssClassName.php
+++ /dev/null
@@ -1,134 +0,0 @@
-assertStringContainsString( $expected_class, $result, 'Custom CSS class should be present in the output.' );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_adds_class_to_content() {
- return array(
- 'class is added to block content' => array(
- 'block_content' => 'Test content
',
- 'block' => array(
- 'blockName' => 'core/paragraph',
- 'attrs' => array(
- 'className' => 'wp-custom-css-123abc',
- ),
- ),
- 'expected_class' => 'wp-custom-css-123abc',
- ),
- 'class is extracted from mixed class names' => array(
- 'block_content' => 'Test content
', - 'block' => array( - 'blockName' => 'core/paragraph', - 'attrs' => array( - 'className' => 'my-class wp-custom-css-mixed123 another-class', - ), - ), - 'expected_class' => 'wp-custom-css-mixed123', - ), - ); - } - - /** - * Tests that existing classes are preserved when the custom CSS class is added. - * - * @ticket 64544 - * - * @covers ::wp_render_custom_css_class_name - */ - public function test_preserves_existing_classes() { - $block_content = 'Test content
';
- $block = array(
- 'blockName' => 'core/paragraph',
- 'attrs' => array(
- 'className' => 'wp-custom-css-456def',
- ),
- );
-
- $result = wp_render_custom_css_class_name( $block_content, $block );
-
- $this->assertStringContainsString( 'existing-class', $result, 'Existing classes should be preserved.' );
- $this->assertStringContainsString( 'another-class', $result, 'All existing classes should be preserved.' );
- $this->assertStringContainsString( 'wp-custom-css-456def', $result, 'Custom CSS class should be added.' );
- }
-
- /**
- * Tests that block content is returned unchanged when no custom CSS class should be applied.
- *
- * @ticket 64544
- *
- * @covers ::wp_render_custom_css_class_name
- *
- * @dataProvider data_returns_unchanged_content
- *
- * @param string $block_content The rendered block content.
- * @param array $block The block data.
- */
- public function test_returns_unchanged_content( $block_content, $block ) {
- $result = wp_render_custom_css_class_name( $block_content, $block );
-
- $this->assertSame( $block_content, $result, 'Block content should remain unchanged.' );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_returns_unchanged_content() {
- return array(
- 'no custom CSS class in attrs' => array(
- 'block_content' => 'Test content
',
- 'block' => array(
- 'blockName' => 'core/paragraph',
- 'attrs' => array(
- 'className' => 'some-other-class',
- ),
- ),
- ),
- 'className is not set in attrs' => array(
- 'block_content' => 'Test content
',
- 'block' => array(
- 'blockName' => 'core/paragraph',
- 'attrs' => array(),
- ),
- ),
- 'block content is empty' => array(
- 'block_content' => '',
- 'block' => array(
- 'blockName' => 'core/paragraph',
- 'attrs' => array(
- 'className' => 'wp-custom-css-789ghi',
- ),
- ),
- ),
- );
- }
-}
diff --git a/tests/phpunit/tests/block-supports/wpRenderCustomCssSupportStyles.php b/tests/phpunit/tests/block-supports/wpRenderCustomCssSupportStyles.php
deleted file mode 100644
index 0048b379f8f33..0000000000000
--- a/tests/phpunit/tests/block-supports/wpRenderCustomCssSupportStyles.php
+++ /dev/null
@@ -1,267 +0,0 @@
-test_block_name = null;
- }
-
- public function tear_down() {
- if ( $this->test_block_name ) {
- unregister_block_type( $this->test_block_name );
- }
- $this->test_block_name = null;
- parent::tear_down();
- }
-
- /**
- * Tests that custom CSS support adds a class name when valid CSS is present.
- *
- * @ticket 64544
- *
- * @covers ::wp_render_custom_css_support_styles
- *
- * @dataProvider data_adds_class_name
- *
- * @param string $block_name The test block name to register.
- * @param array $supports The block support configuration.
- * @param array $parsed_block The parsed block data.
- */
- public function test_adds_class_name( $block_name, $supports, $parsed_block ) {
- $this->test_block_name = $block_name;
- register_block_type(
- $this->test_block_name,
- array(
- 'api_version' => 3,
- 'attributes' => array(
- 'style' => array(
- 'type' => 'object',
- ),
- ),
- 'supports' => $supports,
- )
- );
-
- $result = wp_render_custom_css_support_styles( $parsed_block );
-
- $this->assertArrayHasKey( 'className', $result['attrs'], 'Block should have className added.' );
- $this->assertMatchesRegularExpression( '/wp-custom-css-/', $result['attrs']['className'], 'className should contain wp-custom-css- prefix.' );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_adds_class_name() {
- return array(
- 'class name is added when custom CSS is present' => array(
- 'block_name' => 'test/custom-css-block',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-block',
- 'attrs' => array(
- 'style' => array(
- 'css' => 'color: red;',
- ),
- ),
- ),
- ),
- 'class name is added when support is not explicitly set' => array(
- 'block_name' => 'test/custom-css-default',
- 'supports' => array(),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-default',
- 'attrs' => array(
- 'style' => array(
- 'css' => 'font-weight: bold;',
- ),
- ),
- ),
- ),
- 'class name is added for valid CSS with url() values' => array(
- 'block_name' => 'test/custom-css-valid',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-valid',
- 'attrs' => array(
- 'style' => array(
- 'css' => 'color: red; background: url("image.png"); font-size: 16px;',
- ),
- ),
- ),
- ),
- );
- }
-
- /**
- * Tests that existing className is preserved when custom CSS class is added.
- *
- * @ticket 64544
- *
- * @covers ::wp_render_custom_css_support_styles
- */
- public function test_preserves_existing_class_name() {
- $this->test_block_name = 'test/custom-css-block-existing';
- register_block_type(
- $this->test_block_name,
- array(
- 'api_version' => 3,
- 'attributes' => array(
- 'style' => array(
- 'type' => 'object',
- ),
- ),
- 'supports' => array( 'customCSS' => true ),
- )
- );
-
- $parsed_block = array(
- 'blockName' => 'test/custom-css-block-existing',
- 'attrs' => array(
- 'className' => 'my-existing-class',
- 'style' => array(
- 'css' => 'color: blue;',
- ),
- ),
- );
-
- $result = wp_render_custom_css_support_styles( $parsed_block );
-
- $this->assertStringContainsString( 'my-existing-class', $result['attrs']['className'], 'Existing className should be preserved.' );
- $this->assertMatchesRegularExpression( '/wp-custom-css-/', $result['attrs']['className'], 'className should also contain wp-custom-css- prefix.' );
- }
-
- /**
- * Tests that custom CSS support does not add a class name when CSS should not be applied.
- *
- * @ticket 64544
- *
- * @covers ::wp_render_custom_css_support_styles
- *
- * @dataProvider data_does_not_add_class_name
- *
- * @param string $block_name The test block name to register.
- * @param array $supports The block support configuration.
- * @param array $parsed_block The parsed block data.
- */
- public function test_does_not_add_class_name( $block_name, $supports, $parsed_block ) {
- $this->test_block_name = $block_name;
- register_block_type(
- $this->test_block_name,
- array(
- 'api_version' => 3,
- 'attributes' => array(
- 'style' => array(
- 'type' => 'object',
- ),
- ),
- 'supports' => $supports,
- )
- );
-
- $result = wp_render_custom_css_support_styles( $parsed_block );
-
- $this->assertArrayNotHasKey( 'className', $result['attrs'], 'Block should not have className added.' );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_does_not_add_class_name() {
- return array(
- 'support is disabled' => array(
- 'block_name' => 'test/custom-css-disabled',
- 'supports' => array( 'customCSS' => false ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-disabled',
- 'attrs' => array(
- 'style' => array(
- 'css' => 'color: green;',
- ),
- ),
- ),
- ),
- 'no CSS attribute present' => array(
- 'block_name' => 'test/custom-css-no-css',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-no-css',
- 'attrs' => array(
- 'style' => array(
- 'color' => 'red',
- ),
- ),
- ),
- ),
- 'CSS is empty' => array(
- 'block_name' => 'test/custom-css-empty',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-empty',
- 'attrs' => array(
- 'style' => array(
- 'css' => '',
- ),
- ),
- ),
- ),
- 'CSS is whitespace only' => array(
- 'block_name' => 'test/custom-css-whitespace',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-whitespace',
- 'attrs' => array(
- 'style' => array(
- 'css' => ' ',
- ),
- ),
- ),
- ),
- 'no style attribute' => array(
- 'block_name' => 'test/custom-css-no-style',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-no-style',
- 'attrs' => array(),
- ),
- ),
- 'CSS contains HTML opening tags' => array(
- 'block_name' => 'test/custom-css-html-open',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-html-open',
- 'attrs' => array(
- 'style' => array(
- 'css' => '',
- ),
- ),
- ),
- ),
- 'CSS contains HTML closing tags' => array(
- 'block_name' => 'test/custom-css-html-close',
- 'supports' => array( 'customCSS' => true ),
- 'parsed_block' => array(
- 'blockName' => 'test/custom-css-html-close',
- 'attrs' => array(
- 'style' => array(
- 'css' => 'color: red;',
- ),
- ),
- ),
- ),
- );
- }
-}
diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php
index d89aa35f06e72..e5255ba5ae011 100644
--- a/tests/phpunit/tests/block-template-utils.php
+++ b/tests/phpunit/tests/block-template-utils.php
@@ -297,83 +297,6 @@ public function data_remove_theme_attribute_in_block_template_content() {
);
}
- /**
- * Tests that a skip link is added and a MAIN element without an ID receives the default ID.
- *
- * @ticket 64361
- *
- * @covers ::_block_template_add_skip_link
- */
- public function test_block_template_add_skip_link_inserts_link_and_adds_main_id_when_missing() {
- $template_html = 'Content
Hello world!
', $output ); + $this->assertSame( 'Hello world!
', $output ); } /** @@ -99,7 +99,7 @@ public function test_render_subsequent() { $block = new WP_Block( $parsed_block ); $output = $block->render(); $output .= $block->render(); - $this->assertSame( 'Hello world!
Hello world!
', $output ); + $this->assertSame( 'Hello world!
Hello world!
', $output ); } public function test_ref_empty() { diff --git a/tests/phpunit/tests/blocks/resolvePatternBlocks.php b/tests/phpunit/tests/blocks/resolvePatternBlocks.php index 4b28db4613f00..b2e6fa6463f7d 100644 --- a/tests/phpunit/tests/blocks/resolvePatternBlocks.php +++ b/tests/phpunit/tests/blocks/resolvePatternBlocks.php @@ -30,74 +30,12 @@ public function set_up() { 'description' => 'Recursive pattern.', ) ); - register_block_pattern( - 'core/single-root', - array( - 'title' => 'Single Root Pattern', - 'content' => 'Single root content', - 'description' => 'A single root pattern.', - 'categories' => array( 'text' ), - ) - ); - register_block_pattern( - 'core/single-root-with-forbidden-chars-in-attrs', - array( - 'title' => 'Single Root Pattern', - 'content' => 'Single root content', - 'description' => 'A single root pattern.
-
-
-
-HTML;
+ $block_markup = '
+
+ First child
-
-
-
-Last child
-
-
+
+
+
+ ';
// TODO: Add case where a dynamic block renders other blocks?
return array(
'all_printed' => array(
'set_up' => null,
'block_markup' => $block_markup,
- 'expected_rendered_block' => <<<'HTML'
-
-First child
+
+
+
+ Last child
+
+
-
-
-
-HTML
- ,
+ 'expected_rendered_block' => '
+ First child
-
-Hello World!
- -Last child
-
-
+
+ ',
'expected_styles' => array( 'static-view-style', 'static-child-view-style', 'dynamic-view-style' ),
'expected_scripts' => array( 'static-view-script', 'static-child-view-script', 'dynamic-view-script' ),
'expected_script_modules' => array( 'static-view-script-module', 'static-child-view-script-module', 'dynamic-view-script-module' ),
@@ -421,20 +414,13 @@ static function ( $content ) {
);
},
'block_markup' => $block_markup,
- 'expected_rendered_block' => <<<'HTML'
-
-First child
+ Hello World!
+Last child
+
-
-
-
-HTML
- ,
+ 'expected_rendered_block' => '
+ First child
-
-Hello World!
- -Last child
-
-
+
+ ',
'expected_styles' => array( 'static-view-style', 'dynamic-extra', 'static-child-view-style', 'dynamic-view-style' ),
'expected_scripts' => array( 'static-view-script', 'static-child-view-script', 'dynamic-view-script' ),
'expected_script_modules' => array( 'static-view-script-module', 'static-child-view-script-module', 'dynamic-view-script-module' ),
@@ -444,20 +430,12 @@ static function ( $content ) {
add_filter( 'render_block_core/dynamic', '__return_empty_string' );
},
'block_markup' => $block_markup,
- 'expected_rendered_block' => <<<'HTML'
-
-First child
+ Hello World!
+Last child
+
-
-
-
-HTML
- ,
+ 'expected_rendered_block' => '
+ First child
-
-
-
-Last child
-
-
+
+ ',
'expected_styles' => array( 'static-view-style', 'static-child-view-style' ),
'expected_scripts' => array( 'static-view-script', 'static-child-view-script' ),
'expected_script_modules' => array( 'static-view-script-module', 'static-child-view-script-module' ),
@@ -478,20 +456,12 @@ static function ( $enqueue, $block_name ) {
);
},
'block_markup' => $block_markup,
- 'expected_rendered_block' => <<<'HTML'
-
-First child
+ Last child
+
-
-
-
-HTML
- ,
+ 'expected_rendered_block' => '
+ First child
-
-
-
-Last child
-
-
+
+ ',
'expected_styles' => array( 'static-view-style', 'static-child-view-style', 'dynamic-view-style' ),
'expected_scripts' => array( 'static-view-script', 'static-child-view-script', 'dynamic-view-script' ),
'expected_script_modules' => array( 'static-view-script-module', 'static-child-view-script-module', 'dynamic-view-script-module' ),
@@ -518,16 +488,11 @@ static function ( $content ) {
add_filter( 'render_block_core/static-child', '__return_empty_string' );
},
'block_markup' => $block_markup,
- 'expected_rendered_block' => <<<'HTML'
-
-First child
+ Last child
+
-
-
-
-HTML
- ,
+ 'expected_rendered_block' => '
+ Hello World!
- -
+
+ ',
'expected_styles' => array( 'static-view-style', 'dynamic-view-style' ),
'expected_scripts' => array( 'static-view-script', 'dynamic-view-script' ),
'expected_script_modules' => array( 'static-view-script-module', 'dynamic-view-script-module' ),
@@ -547,18 +512,12 @@ static function ( $content ) {
);
},
'block_markup' => $block_markup,
- 'expected_rendered_block' => <<<'HTML'
-
-Hello World!
+
-
-
-
-HTML
- ,
+ 'expected_rendered_block' => '
+ First child
-
-Hello World!
- -
+
+ ',
'expected_styles' => array( 'static-view-style', 'static-child-view-style', 'dynamic-view-style' ),
'expected_scripts' => array( 'static-view-script', 'static-child-view-script', 'dynamic-view-script' ),
'expected_script_modules' => array( 'static-view-script-module', 'static-child-view-script-module', 'dynamic-view-script-module' ),
@@ -603,8 +562,9 @@ static function ( $content ) {
);
},
'block_markup' => '',
- 'expected_rendered_block' =>
- '',
+ 'expected_rendered_block' => '
+
+ ',
'expected_styles' => array( 'static-view-style', 'admin-bar' ),
'expected_scripts' => array( 'static-view-script', 'admin-bar' ),
'expected_script_modules' => array( 'static-view-script-module' ),
@@ -708,7 +668,7 @@ public function test_render_enqueues_scripts_and_styles( ?Closure $set_up, strin
);
// TODO: Why not use do_blocks() instead?
- $parsed_blocks = parse_blocks( $block_markup );
+ $parsed_blocks = parse_blocks( trim( $block_markup ) );
$parsed_block = $parsed_blocks[0];
$context = array();
$block = new WP_Block( $parsed_block, $context, $this->registry );
@@ -722,7 +682,7 @@ public function test_render_enqueues_scripts_and_styles( ?Closure $set_up, strin
$expected_rendered_block,
$rendered_block,
'',
- 'Rendered block does not contain expected HTML.'
+ "Rendered block does not contain expected HTML:\n$rendered_block"
);
}
@@ -837,102 +797,6 @@ public function test_build_query_vars_from_query_block() {
);
}
- /**
- * @ticket 64416
- */
- public function test_build_query_vars_from_query_block_tax_query_old_format() {
- $this->registry->register(
- 'core/example',
- array( 'uses_context' => array( 'query' ) )
- );
-
- $parsed_blocks = parse_blocks( 'ab' );
- $parsed_block = $parsed_blocks[0];
- $context = array(
- 'query' => array(
- 'taxQuery' => array(
- 'category' => array( 1, 2, 3 ),
- 'post_tag' => array( 10, 20 ),
- ),
- ),
- );
- $block = new WP_Block( $parsed_block, $context, $this->registry );
- $query = build_query_vars_from_query_block( $block, 1 );
-
- $this->assertSame(
- array(
- 'post_type' => 'post',
- 'order' => 'DESC',
- 'orderby' => 'date',
- 'post__not_in' => array(),
- 'tax_query' => array(
- array(
- 'taxonomy' => 'category',
- 'terms' => array( 1, 2, 3 ),
- 'include_children' => false,
- ),
- array(
- 'taxonomy' => 'post_tag',
- 'terms' => array( 10, 20 ),
- 'include_children' => false,
- ),
- ),
- ),
- $query
- );
- }
-
- /**
- * @ticket 64416
- */
- public function test_build_query_vars_from_query_block_tax_query_include_exclude() {
- $this->registry->register(
- 'core/example',
- array( 'uses_context' => array( 'query' ) )
- );
-
- $parsed_blocks = parse_blocks( 'ab' );
- $parsed_block = $parsed_blocks[0];
- $context = array(
- 'query' => array(
- 'taxQuery' => array(
- 'include' => array(
- 'category' => array( 1, 2, 3 ),
- ),
- 'exclude' => array(
- 'post_tag' => array( 15 ),
- ),
- ),
- ),
- );
- $block = new WP_Block( $parsed_block, $context, $this->registry );
- $query = build_query_vars_from_query_block( $block, 1 );
-
- $this->assertSame(
- array(
- 'post_type' => 'post',
- 'order' => 'DESC',
- 'orderby' => 'date',
- 'post__not_in' => array(),
- 'tax_query' => array(
- array(
- 'taxonomy' => 'category',
- 'terms' => array( 1, 2, 3 ),
- 'operator' => 'IN',
- 'include_children' => false,
- ),
- array(
- 'taxonomy' => 'post_tag',
- 'terms' => array( 15 ),
- 'operator' => 'NOT IN',
- 'include_children' => false,
- ),
- ),
- ),
- $query
- );
- }
-
/**
* @ticket 62014
*/
diff --git a/tests/phpunit/tests/build-visual-html-tree.php b/tests/phpunit/tests/build-visual-html-tree.php
index e87cc1d1d257a..42e35c5b74b9f 100644
--- a/tests/phpunit/tests/build-visual-html-tree.php
+++ b/tests/phpunit/tests/build-visual-html-tree.php
@@ -9,13 +9,13 @@
*/
class Tests_Build_Equivalent_HTML_Semantic_Tree extends WP_UnitTestCase {
public function data_build_equivalent_html_semantic_tree() {
- $block_markup = <<<'HTML'
-
- First child
+ Hello World!
+- -HTML; + $block_markup = <<
+ +END; - $tree_structure = <<<'TREE' + $tree_structure = <<
space-surrounded
-nbsp-surrounded
--newline-surrounded
-tab-surrounded
-ok
-HTML; - - $expected = <<- "\u{00A0}nbsp-surrounded\u{00A0}" -"\n" -
- "\nnewline-surrounded\n" -"\n" -
- "\ttab-surrounded\t" -"\n" -
- "ok" - -TREE; - - $tree_result = build_visual_html_tree( $html, '
' ); - $this->assertSame( $expected, $tree_result ); - } } diff --git a/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php b/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php index 9dbb1f244ccf8..728998fa53c7d 100644 --- a/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php +++ b/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php @@ -47,8 +47,8 @@ public function test_using_filter_adjusts_comment_count_without_an_additional_da } /** - * @ticket 64325 - */ + * @ticket 64325 + */ public function test_only_approved_regular_comments_are_counted() { $post_id = self::factory()->post->create(); diff --git a/tests/phpunit/tests/compat/arrayKeyFirst.php b/tests/phpunit/tests/compat/arrayKeyFirst.php new file mode 100644 index 0000000000000..28db82e363a6a --- /dev/null +++ b/tests/phpunit/tests/compat/arrayKeyFirst.php @@ -0,0 +1,68 @@ +assertTrue( function_exists( 'array_key_first' ) ); + } + + /** + * @dataProvider data_array_key_first + * + * @ticket 45055 + * + * @param bool $expected The value of the key extracted to extracted from given array. + * @param array $arr The array to get first key from. + */ + public function test_array_key_first( $expected, $arr ) { + $this->assertSame( $expected, array_key_first( $arr ) ); + } + + /** + * Data provider. + * + * @return array[] + */ + public function data_array_key_first() { + return array( + 'string key' => array( + 'expected' => 'key1', + 'arr' => array( + 'key1' => 'val1', + 'key2' => 'val2', + ), + ), + 'int key' => array( + 'expected' => 99, + 'arr' => array( + 99 => 'val1', + 1 => 'val2', + ), + ), + 'no key' => array( + 'expected' => 0, + 'arr' => array( 'val1', 'val2' ), + ), + 'multi array' => array( + 'expected' => 99, + 'arr' => array( + 99 => array( 22 => 'val1' ), + 1 => 'val2', + ), + ), + 'empty array' => array( + 'expected' => null, + 'arr' => array(), + ), + ); + } +} diff --git a/tests/phpunit/tests/compat/arrayKeyLast.php b/tests/phpunit/tests/compat/arrayKeyLast.php new file mode 100644 index 0000000000000..819e850f13769 --- /dev/null +++ b/tests/phpunit/tests/compat/arrayKeyLast.php @@ -0,0 +1,77 @@ +assertTrue( function_exists( 'array_key_last' ) ); + } + + /** + * @dataProvider data_array_key_last + * + * @ticket 45055 + * + * @param bool $expected The value of the key extracted to extracted from given array. + * @param array $arr The array to get last key from. + */ + public function test_array_key_last( $expected, $arr ) { + $this->assertSame( $expected, array_key_last( $arr ) ); + } + + /** + * Data provider for test_array_key_last(). + * + * @return array + */ + public function data_array_key_last() { + return array( + 'string key' => array( + 'expected' => 'key2', + 'arr' => array( + 'key1' => 'val1', + 'key2' => 'val2', + ), + ), + 'int key' => array( + 'expected' => 1, + 'arr' => array( + 99 => 'val1', + 1 => 'val2', + ), + ), + 'no key' => array( + 'expected' => 1, + 'arr' => array( 'val1', 'val2' ), + ), + 'multi array' => array( + 'expected' => 1, + 'arr' => array( + 99 => array( 22 => 'val1' ), + 1 => 'val2', + ), + ), + 'mixed keys' => array( + 'expected' => 1, + 'arr' => array( + 'val1', + 'key2' => 'val2', + 'val3', + ), + ), + 'empty array' => array( + 'expected' => null, + 'arr' => array(), + ), + ); + } +} diff --git a/tests/phpunit/tests/compat/isCountable.php b/tests/phpunit/tests/compat/isCountable.php new file mode 100644 index 0000000000000..66bf3c8c6c09f --- /dev/null +++ b/tests/phpunit/tests/compat/isCountable.php @@ -0,0 +1,117 @@ +assertTrue( function_exists( 'is_countable' ) ); + } + + /** + * Test is_countable() polyfill. + * + * @ticket 43583 + * + * @dataProvider data_is_countable_functionality + * + * @param mixed $variable Variable to check. + * @param bool $is_countable The expected return value of PHP 7.3 is_countable() function. + */ + public function test_is_countable_functionality( $variable, $is_countable ) { + $this->assertSame( $is_countable, is_countable( $variable ) ); + } + + /** + * Data provider for test_is_countable_functionality(). + * + * @ticket 43583 + * + * @return array { + * @type array { + * @type mixed $variable Variable to check. + * @type bool $is_countable The expected return value of PHP 7.3 is_countable() function. + * } + * } + */ + public function data_is_countable_functionality() { + return array( + 'boolean true' => array( + 'variable' => true, + 'is_countable' => false, + ), + 'plain stdClass object' => array( + 'variable' => new stdClass(), + 'is_countable' => false, + ), + 'Array iterator object' => array( + 'variable' => new ArrayIteratorFakeForIsCountable(), + 'is_countable' => true, + ), + 'Countable object' => array( + 'variable' => new CountableFakeForIsCountable(), + 'is_countable' => true, + ), + 'integer 16' => array( + 'variable' => 16, + 'is_countable' => false, + ), + 'null' => array( + 'variable' => null, + 'is_countable' => false, + ), + 'non-empty array, 3 items' => array( + 'variable' => array( 1, 2, 3 ), + 'is_countable' => true, + ), + 'non-empty array, 1 item via cast' => array( + 'variable' => (array) 1, + 'is_countable' => true, + ), + 'array cast to object' => array( + 'variable' => (object) array( 'foo', 'bar', 'baz' ), + 'is_countable' => false, + ), + ); + } + + /** + * Test is_countable() polyfill for ResourceBundle. + * + * @ticket 43583 + * + * @requires extension intl + */ + public function test_is_countable_ResourceBundle() { + $this->assertTrue( is_countable( new ResourceBundle( 'en', null ) ) ); + } + + /** + * Test is_countable() polyfill for SimpleXMLElement. + * + * @ticket 43583 + * + * @requires extension simplexml + */ + public function test_is_countable_SimpleXMLElement() { + $this->assertTrue( is_countable( new SimpleXMLElement( 'paragraph
+paragraph
@@ -25,7 +25,7 @@ class Tests_Formatting_ExcerptRemoveBlocks extends WP_UnitTestCase { -paragraph inside column
+paragraph inside column
@@ -35,12 +35,12 @@ class Tests_Formatting_ExcerptRemoveBlocks extends WP_UnitTestCase { public $filtered_content = ' -paragraph
+paragraph
-paragraph inside column
+paragraph inside column
'; diff --git a/tests/phpunit/tests/formatting/isEmail.php b/tests/phpunit/tests/formatting/isEmail.php index eb5a0379b8515..c3f0a7c45b001 100644 --- a/tests/phpunit/tests/formatting/isEmail.php +++ b/tests/phpunit/tests/formatting/isEmail.php @@ -6,21 +6,8 @@ * @covers ::is_email */ class Tests_Formatting_IsEmail extends WP_UnitTestCase { - - /** - * @dataProvider valid_email_provider - */ - public function test_returns_the_email_address_if_it_is_valid( $email ) { - $this->assertSame( $email, is_email( $email ), "is_email() should return the email address for $email." ); - } - - /** - * Data provider for valid email addresses. - * - * @return array - */ - public static function valid_email_provider() { - $valid_emails = array( + public function test_returns_the_email_address_if_it_is_valid() { + $data = array( 'bob@example.com', 'phil@example.info', 'ace@204.32.222.14', @@ -28,26 +15,13 @@ public static function valid_email_provider() { 'a@b.co', 'bill+ted@example.com', ); - - foreach ( $valid_emails as $email ) { - yield $email => array( $email ); + foreach ( $data as $datum ) { + $this->assertSame( $datum, is_email( $datum ), $datum ); } } - /** - * @dataProvider invalid_email_provider - */ - public function test_returns_false_if_given_an_invalid_email_address( $email ) { - $this->assertFalse( is_email( $email ), "is_email() should return false for $email." ); - } - - /** - * Data provider for invalid email addresses. - * - * @return array - */ - public static function invalid_email_provider() { - $invalid_emails = array( + public function test_returns_false_if_given_an_invalid_email_address() { + $data = array( 'khaaaaaaaaaaaaaaan!', 'http://bob.example.com/', "sif i'd give u it, spamer!1", @@ -55,9 +29,8 @@ public static function invalid_email_provider() { 'bob@your mom', 'a@b.c', ); - - foreach ( $invalid_emails as $email ) { - yield $email => array( $email ); + foreach ( $data as $datum ) { + $this->assertFalse( is_email( $datum ), $datum ); } } } diff --git a/tests/phpunit/tests/formatting/removeAccents.php b/tests/phpunit/tests/formatting/removeAccents.php index 184cd9d1d5dd3..8140d2df9b8c7 100644 --- a/tests/phpunit/tests/formatting/removeAccents.php +++ b/tests/phpunit/tests/formatting/removeAccents.php @@ -108,16 +108,6 @@ public function test_remove_accents_germanic_umlauts() { $this->assertSame( 'AeOeUeaeoeuess', remove_accents( 'ÄÖÜäöüß', 'de_DE' ) ); } - /** - * @ticket 64821 - */ - public function test_remove_accents_germanic_capital_eszett() { - // U+1E9E LATIN CAPITAL LETTER SHARP S, standardized in German orthography in 2017 (DIN 5008). - $this->assertSame( 'SS', remove_accents( 'ẞ', 'de_DE' ) ); - // Verify it works in context alongside the lowercase variant. - $this->assertSame( 'SSstrasse', remove_accents( 'ẞstraße', 'de_DE' ) ); - } - /** * @ticket 23907 */ diff --git a/tests/phpunit/tests/formatting/wpSlash.php b/tests/phpunit/tests/formatting/wpSlash.php index 3617b4bfa4ea0..aa0664d791b92 100644 --- a/tests/phpunit/tests/formatting/wpSlash.php +++ b/tests/phpunit/tests/formatting/wpSlash.php @@ -101,37 +101,4 @@ public function test_add_even_more_slashes() { $this->assertSame( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array. $this->assertSame( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed. } - - /** - * Tests that addslashes_gpc() returns the same result as wp_slash() for strings. - * - * @ticket 64539 - * @covers ::addslashes_gpc - * @expectedDeprecated addslashes_gpc - */ - public function test_addslashes_gpc_matches_wp_slash_for_strings() { - $input = "String with 'quotes' and \"double quotes\""; - $this->assertSame( wp_slash( $input ), addslashes_gpc( $input ) ); - } - - /** - * Tests that addslashes_gpc() returns the same result as wp_slash() for arrays. - * - * @ticket 64539 - * @covers ::addslashes_gpc - * @expectedDeprecated addslashes_gpc - */ - public function test_addslashes_gpc_matches_wp_slash_for_arrays() { - $input = array( - 'field1' => "Value with 'apostrophe'", - 'field2' => 'Value with "quotes"', - 'field3' => 'user@example.com', - 'nested' => array( - 'key1' => 'Nested value with \\ backslash', - 'key2' => array( 'deeply', 'nested', 'array' ), - ), - ); - - $this->assertSame( wp_slash( $input ), addslashes_gpc( $input ) ); - } } diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php index b6080da780ba8..ccbe24385e14e 100644 --- a/tests/phpunit/tests/functions.php +++ b/tests/phpunit/tests/functions.php @@ -222,66 +222,9 @@ public function data_wp_normalize_path() { array( 'php://input', 'php://input' ), array( 'http://example.com//path.ext', 'http://example.com/path.ext' ), array( 'file://c:\\www\\path\\', 'file://C:/www/path/' ), - - // Edge cases. - array( '', '' ), // Empty string should return empty string. - array( 123, '123' ), // Integer should be cast to string. ); } - /** - * Tests that wp_normalize_path() works with objects that have __toString(). - * - * This is important because the function uses a static cache, and the input - * must be cast to string before being used as an array key. - * - * @ticket 64538 - */ - public function test_wp_normalize_path_with_stringable_object() { - $file_info = new SplFileInfo( '/var/www/html\\test' ); - - $this->assertSame( '/var/www/html/test', wp_normalize_path( $file_info ) ); - } - - /** - * Tests that wp_normalize_path() returns consistent results on repeated calls. - * - * The function uses a static cache, so this verifies cache behavior. - * - * @ticket 64538 - */ - public function test_wp_normalize_path_returns_consistent_results() { - $path = 'C:\\www\\path\\'; - - $first_call = wp_normalize_path( $path ); - $second_call = wp_normalize_path( $path ); - $third_call = wp_normalize_path( $path ); - - $this->assertSame( $first_call, $second_call, 'Second call should return same result as first.' ); - $this->assertSame( $second_call, $third_call, 'Third call should return same result as second.' ); - $this->assertSame( 'C:/www/path/', $first_call, 'Normalized path should match expected value.' ); - } - - /** - * Tests that wp_normalize_path() static cache stores results. - * - * @ticket 64538 - */ - public function test_wp_normalize_path_static_cache() { - $path = '/var/www/cache-test\\subdir\\'; - $expected = '/var/www/cache-test/subdir/'; - - $result = wp_normalize_path( $path ); - $this->assertSame( $expected, $result ); - - $reflection = new ReflectionFunction( 'wp_normalize_path' ); - $static_vars = $reflection->getStaticVariables(); - - $this->assertArrayHasKey( 'cache', $static_vars, 'Static cache array should exist.' ); - $this->assertArrayHasKey( $path, $static_vars['cache'], 'Cache should contain the normalized path.' ); - $this->assertSame( $expected, $static_vars['cache'][ $path ], 'Cached value should match the expected normalized path.' ); - } - public function test_wp_unique_filename() { $testdir = DIR_TESTDATA . '/images/'; diff --git a/tests/phpunit/tests/functions/wpGetArchives.php b/tests/phpunit/tests/functions/wpGetArchives.php index 99967e9be3211..3f98d5c5644f6 100644 --- a/tests/phpunit/tests/functions/wpGetArchives.php +++ b/tests/phpunit/tests/functions/wpGetArchives.php @@ -221,10 +221,10 @@ static function ( $args ) { $ids = array_slice( array_reverse( self::$post_ids ), 0, 3 ); $expected = join( - '', + "\n", array_map( static function ( $id ) { - return sprintf( "\t\nline 1\nline 2", - "
line 1\nline 2", - ), - 'Double leading newline in PRE' => array( - "
\n\nline 2\nline 3", - "
\n\nline 2\nline 3", - ), - 'Multiple text nodes inside PRE' => array( - "
\nline 1 still line 1", - '
line 1 still line 1', - ), - 'Multiple text nodes inside PRE with leading newlines' => array( - "
\n\nline 2 still line 2", - "
\n\nline 2 still line 2", - ), - 'Leading newline in LISTING' => array( - "
is irrelevant but illustrates the case-insentivity.
@@ -1079,106 +1079,4 @@ public function test_next_tag_lowercase_tag_name() {
$processor = WP_HTML_Processor::create_fragment( '