WordPress · oandregal · Oct 20, 2020 · Oct 20, 2020 · Oct 20, 2020 · Oct 20, 2020
diff --git a/lib/class-wp-block-supports.php b/lib/class-wp-block-supports.php
@@ -67,14 +67,12 @@ public function register( $block_support_name, $block_support_config ) {
 	 * Generates an array of HTML attributes, such as classes, by applying to
 	 * the given block all of the features that the block supports.
 	 *
-	 * @param  array $parsed_block Block as parsed from content.
+	 * @param  string $block_name The name of the block to be processed.
+	 * @param  array  $block_attributes The attributes of the block to be processed.
 	 * @return array               Array of HTML attributes.
 	 */
-	public function apply_block_supports( $parsed_block ) {
-		$block_attributes = $parsed_block['attrs'];
-		$block_type       = WP_Block_Type_Registry::get_instance()->get_registered(
-			$parsed_block['blockName']
-		);
+	public function apply_block_supports( $block_name, $block_attributes ) {
+		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
 
 		// If no render_callback, assume styles have been previously handled.
 		if ( ! $block_type || empty( $block_type ) ) {
@@ -139,13 +137,14 @@ private function register_attributes() {
  * Generates a string of attributes by applying to the current block being
  * rendered all of the features that the block supports.
  *
- * @param array $extra_attributes Optional. Extra attributes to render on the block wrapper.
+ * @param string $block_name The name of the block to be processed.
+ * @param array  $block_attributes The attributes of the block to be processed.
+ * @param array  $extra_attributes Optional. Extra attributes to render on the block wrapper.
  *
  * @return string String of HTML classes.
  */
-function get_block_wrapper_attributes( $extra_attributes = array() ) {
-	global $current_parsed_block;
-	$new_attributes = WP_Block_Supports::get_instance()->apply_block_supports( $current_parsed_block );
+function get_block_wrapper_attributes( $block_name, $block_attributes, $extra_attributes = array() ) {
+	$new_attributes = WP_Block_Supports::get_instance()->apply_block_supports( $block_name, $block_attributes );
 
 	if ( empty( $new_attributes ) && empty( $extra_attributes ) ) {
 		return '';

diff --git a/lib/class-wp-block.php b/lib/class-wp-block.php
@@ -203,7 +203,6 @@ public function __get( $name ) {
 	 */
 	public function render( $options = array() ) {
 		global $post;
-		global $current_parsed_block;
 		$options = array_replace(
 			array(
 				'dynamic' => true,
@@ -217,14 +216,9 @@ public function render( $options = array() ) {
 		if ( ! $options['dynamic'] || empty( $this->block_type->skip_inner_blocks ) ) {
 			$index = 0;
 			foreach ( $this->inner_content as $chunk ) {
-				if ( is_string( $chunk ) ) {
-					$block_content .= $chunk;
-				} else {
-					$parent_parsed_block  = $current_parsed_block;
-					$current_parsed_block = $this->inner_blocks[ $index ]->parsed_block;
-					$block_content       .= $this->inner_blocks[ $index++ ]->render();
-					$current_parsed_block = $parent_parsed_block;
-				}
+				$block_content .= is_string( $chunk ) ?
+					$chunk :
+					$this->inner_blocks[ $index++ ]->render();
 			}
 		}
 

diff --git a/lib/compat.php b/lib/compat.php
@@ -366,18 +366,11 @@ function gutenberg_replace_default_block_categories( $default_categories ) {
 }
 add_filter( 'block_categories', 'gutenberg_replace_default_block_categories' );
 
-global $current_parsed_block;
-$current_parsed_block = array(
-	'blockName'  => null,
-	'attributes' => null,
-);
-
 /**
  * Shim that hooks into `pre_render_block` so as to override `render_block` with
  * a function that assigns block context.
  *
  * The context handling can be removed when plugin support requires WordPress 5.5.0+.
- * The global current_parsed_block assignment can be removed when plugin support requires WordPress 5.6.0+.
  *
  * @see https://core.trac.wordpress.org/ticket/49927
  * @see https://core.trac.wordpress.org/changeset/48243
@@ -389,7 +382,6 @@ function gutenberg_replace_default_block_categories( $default_categories ) {
  */
 function gutenberg_render_block_with_assigned_block_context( $pre_render, $parsed_block ) {
 	global $post, $wp_query;
-	global $current_parsed_block;
 
 	/*
 	 * If a non-null value is provided, a filter has run at an earlier priority
@@ -399,8 +391,6 @@ function gutenberg_render_block_with_assigned_block_context( $pre_render, $parse
 		return $pre_render;
 	}
 
-	$current_parsed_block = $parsed_block;
-
 	$source_block = $parsed_block;
 
 	/** This filter is documented in src/wp-includes/blocks.php */

diff --git a/packages/block-library/src/archives/index.php b/packages/block-library/src/archives/index.php
@@ -10,11 +10,13 @@
  *
  * @see WP_Widget_Archives
  *
- * @param array $attributes The block attributes.
+ * @param Array   $attributes The block attributes.
+ * @param String  $content InnerBlocks content of the Block.
+ * @param WPBlock $block Block object.
  *
  * @return string Returns the post content with archives added.
  */
-function render_block_core_archives( $attributes ) {
+function render_block_core_archives( $attributes, $content, $block ) {
 	$show_post_count = ! empty( $attributes['showPostCounts'] );
 
 	$class = '';
@@ -97,7 +99,11 @@ function render_block_core_archives( $attributes ) {
 		);
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => $classnames )
+	);
 
 	return sprintf(
 		'<ul %1$s>%2$s</ul>',

diff --git a/packages/block-library/src/calendar/index.php b/packages/block-library/src/calendar/index.php
@@ -8,11 +8,13 @@
 /**
  * Renders the `core/calendar` block on server.
  *
- * @param array $attributes The block attributes.
+ * @param Array   $attributes The block attributes.
+ * @param String  $content InnerBlocks content of the Block.
+ * @param WPBlock $block Block object.
  *
  * @return string Returns the block content.
  */
-function render_block_core_calendar( $attributes ) {
+function render_block_core_calendar( $attributes, $content, $block ) {
 	global $monthnum, $year;
 
 	$previous_monthnum = $monthnum;
@@ -31,7 +33,10 @@ function render_block_core_calendar( $attributes ) {
 		}
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes();
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes
+	);
 	$output             = sprintf(
 		'<div %1$s>%2$s</div>',
 		$wrapper_attributes,

diff --git a/packages/block-library/src/categories/index.php b/packages/block-library/src/categories/index.php
@@ -8,11 +8,13 @@
 /**
  * Renders the `core/categories` block on server.
  *
- * @param array $attributes The block attributes.
+ * @param Array   $attributes The block attributes.
+ * @param String  $content InnerBlocks content of the Block.
+ * @param WPBlock $block Block object.
  *
  * @return string Returns the categories list/dropdown markup.
  */
-function render_block_core_categories( $attributes ) {
+function render_block_core_categories( $attributes, $content, $block ) {
 	static $block_id = 0;
 	$block_id++;
 
@@ -47,7 +49,11 @@ function render_block_core_categories( $attributes ) {
 		$type           = 'list';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type}" ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => "wp-block-categories-{$type}" )
+	);
 
 	return sprintf(
 		$wrapper_markup,

diff --git a/packages/block-library/src/latest-comments/index.php b/packages/block-library/src/latest-comments/index.php
@@ -36,11 +36,13 @@ function wp_latest_comments_draft_or_post_title( $post = 0 ) {
 /**
  * Renders the `core/latest-comments` block on server.
  *
- * @param array $attributes The block attributes.
+ * @param Array   $attributes The block attributes.
+ * @param String  $content InnerBlocks content of the Block.
+ * @param WPBlock $block Block object.
  *
  * @return string Returns the post content with latest comments added.
  */
-function render_block_core_latest_comments( $attributes = array() ) {
+function render_block_core_latest_comments( $attributes = array(), $content, $block ) {
 	// This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php.
 	$comments = get_comments(
 		apply_filters(
@@ -129,7 +131,11 @@ function render_block_core_latest_comments( $attributes = array() ) {
 	if ( empty( $comments ) ) {
 		$classnames[] = 'no-comments';
 	}
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classnames ) ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => implode( ' ', $classnames ) )
+	);
 
 	return ! empty( $comments ) ? sprintf(
 		'<ol %1$s>%2$s</ol>',

diff --git a/packages/block-library/src/latest-posts/index.php b/packages/block-library/src/latest-posts/index.php
@@ -28,11 +28,13 @@ function block_core_latest_posts_get_excerpt_length() {
 /**
  * Renders the `core/latest-posts` block on server.
  *
- * @param array $attributes The block attributes.
+ * @param Array   $attributes The block attributes.
+ * @param String  $content InnerBlocks content of the Block.
+ * @param WPBlock $block Block object.
  *
  * @return string Returns the post content with latest posts added.
  */
-function render_block_core_latest_posts( $attributes ) {
+function render_block_core_latest_posts( $attributes, $content, $block ) {
 	global $post, $block_core_latest_posts_excerpt_length;
 
 	$args = array(
@@ -171,7 +173,11 @@ function render_block_core_latest_posts( $attributes ) {
 		$class .= ' has-author';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $class ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => $class )
+	);
 
 	return sprintf(
 		'<ul %1$s>%2$s</ul>',

diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
@@ -97,9 +97,9 @@ function block_core_navigation_link_render_submenu_icon() {
 /**
  * Renders the `core/navigation-link` block.
  *
- * @param array $attributes The block attributes.
- * @param array $content The saved content.
- * @param array $block The parsed block.
+ * @param array   $attributes The block attributes.
+ * @param array   $content The saved content.
+ * @param WPBlock $block The parsed block.
  *
  * @return string Returns the post content with the legacy widget added.
  */
@@ -128,6 +128,8 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
 	};
 
 	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
 		array(
 			'class' => $css_classes . ( $has_submenu ? ' has-child' : '' ) .
 				( $is_active ? ' current-menu-item' : '' ),

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -97,9 +97,9 @@ function block_core_navigation_render_submenu_icon() {
 /**
  * Renders the `core/navigation` block on server.
  *
- * @param array $attributes The block attributes.
- * @param array $content The saved content.
- * @param array $block The parsed block.
+ * @param array   $attributes The block attributes.
+ * @param array   $content The saved content.
+ * @param WPBlock $block The parsed block.
  *
  * @return string Returns the post content with the legacy widget added.
  */
@@ -140,6 +140,8 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	}
 
 	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
 		array(
 			'class' => implode( ' ', $classes ),
 			'style' => $colors['inline_styles'] . $font_sizes['inline_styles'],

diff --git a/packages/block-library/src/post-author/index.php b/packages/block-library/src/post-author/index.php
@@ -35,7 +35,11 @@ function render_block_core_post_author( $attributes, $content, $block ) {
 		isset( $attributes['textAlign'] ) ? array( 'has-text-align-' . $attributes['textAlign'] ) : array()
 	);
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => implode( ' ', $classes ) )
+	);
 
 	return sprintf( '<div %1$s>', $wrapper_attributes ) .
 	( ! empty( $attributes['showAvatar'] ) ? '<div class="wp-block-post-author__avatar">' . $avatar . '</div>' : '' ) .

diff --git a/packages/block-library/src/post-comment-author/index.php b/packages/block-library/src/post-comment-author/index.php
@@ -18,7 +18,10 @@ function render_block_core_post_comment_author( $attributes, $content, $block )
 		return '';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes();
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes
+	);
 
 	return sprintf(
 		'<div %1$s>%2$s</div>',

diff --git a/packages/block-library/src/post-comment-content/index.php b/packages/block-library/src/post-comment-content/index.php
@@ -17,7 +17,10 @@ function render_block_core_post_comment_content( $attributes, $content, $block )
 	if ( ! isset( $block->context['commentId'] ) ) {
 		return '';
 	}
-	$wrapper_attributes = get_block_wrapper_attributes();
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes
+	);
 	return sprintf(
 		'<div %1$s>%2$s</div>',
 		$wrapper_attributes,

diff --git a/packages/block-library/src/post-comment-date/index.php b/packages/block-library/src/post-comment-date/index.php
@@ -18,7 +18,10 @@ function render_block_core_post_comment_date( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes();
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes
+	);
 	return sprintf(
 		'<div %1$s><time datetime="%2$s">%3$s</time></div>',
 		$wrapper_attributes,

diff --git a/packages/block-library/src/post-comments-count/index.php b/packages/block-library/src/post-comments-count/index.php
@@ -23,7 +23,11 @@ function render_block_core_post_comments_count( $attributes, $content, $block )
 		$classes .= 'has-text-align-' . $attributes['textAlign'];
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => $classes )
+	);
 	return sprintf(
 		'<div class="%1$s">%2$s</div>',
 		$wrapper_attributes,

diff --git a/packages/block-library/src/post-comments-form/index.php b/packages/block-library/src/post-comments-form/index.php
@@ -26,7 +26,11 @@ function render_block_core_post_comments_form( $attributes, $content, $block ) {
 	ob_start();
 	comment_form( array(), $block->context['postId'] );
 	$form               = ob_get_clean();
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => $classes )
+	);
 
 	return sprintf( '<div %1$s>%2$s</div>', $wrapper_attributes, $form );
 }

diff --git a/packages/block-library/src/post-comments/index.php b/packages/block-library/src/post-comments/index.php
@@ -36,7 +36,11 @@ function render_block_core_post_comments( $attributes, $content, $block ) {
 		$classes .= 'has-text-align-' . $attributes['textAlign'];
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => $classes )
+	);
 	$output             = sprintf( '<div %1$s>', $wrapper_attributes ) . ob_get_clean() . '</div>';
 	return $output;
 }

diff --git a/packages/block-library/src/post-content/index.php b/packages/block-library/src/post-content/index.php
@@ -18,7 +18,11 @@ function render_block_core_post_content( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => 'entry-content' ) );
+	$wrapper_attributes = get_block_wrapper_attributes(
+		$block->name,
+		$attributes,
+		array( 'class' => 'entry-content' )
+	);
 
 	return (
 		'<div ' . $wrapper_attributes . '>' .