Pass content to dynamic block render functions

Author: westonruter

lib/blocks.php

@@ -128,8 +128,13 @@ function do_blocks( $content ) {
 			$block_attributes_string = $matches['attributes'][ $index ][0];
 			$block_attributes = parse_block_attributes( $block_attributes_string );
 
+			$content = null;
+			if ( isset( $matches['content'][ $index ][0] ) ) {
+				$content = $matches['content'][ $index ][0];
+			}
+
 			// Call the block's render function to generate the dynamic output.
-			$output = call_user_func( $wp_registered_blocks[ $block_name ]['render'], $block_attributes );
+			$output = call_user_func( $wp_registered_blocks[ $block_name ]['render'], $block_attributes, $content );
 		}
 
 		// Replace the matched block with the static or dynamic output.

phpunit/class-dynamic-blocks-render-test.php

@@ -21,12 +21,13 @@ class Dynamic_Blocks_Render_Test extends WP_UnitTestCase {
 	 * Dummy block rendering function.
 	 *
 	 * @param  array $attributes Block attributes.
+	 * @param  array $content    Content.
 	 *
 	 * @return string             Block output.
 	 */
-	function render_dummy_block( $attributes ) {
+	function render_dummy_block( $attributes, $content ) {
 		$this->dummy_block_instance_number += 1;
-		return $this->dummy_block_instance_number . ':' . $attributes['value'];
+		return $this->dummy_block_instance_number . ':' . $attributes['value'] . ":$content";
 	}
 
 	/**
@@ -64,11 +65,11 @@ function test_dynamic_block_rendering() {
 		$updated_post_content = do_blocks( $post_content );
 		$this->assertEquals( $updated_post_content,
 			'before' .
-			'1:b1' .
-			'2:b1' .
+			'1:b1:' .
+			'2:b1:' .
 			'between' .
-			'3:b2' .
-			'4:b2' .
+			'3:b2:' .
+			'4:b2:' .
 			'after'
 		);
 	}
@@ -88,17 +89,17 @@ function test_dynamic_block_rendering_with_content() {
 		register_block_type( 'core/dummy', $settings );
 		$post_content =
 			'before' .
-			'<!-- wp:core/dummy value="b1" -->this should be ignored<!-- /wp:core/dummy -->' .
+			'<!-- wp:core/dummy value="b1" -->content1<!-- /wp:core/dummy -->' .
 			'between' .
-			'<!-- wp:core/dummy value="b2" -->this should also be ignored<!-- /wp:core/dummy -->' .
+			'<!-- wp:core/dummy value="b2" -->content2<!-- /wp:core/dummy -->' .
 			'after';
 
 		$updated_post_content = do_blocks( $post_content );
 		$this->assertEquals( $updated_post_content,
 			'before' .
-			'1:b1' .
+			'1:b1:content1' .
 			'between' .
-			'2:b2' .
+			'2:b2:content2' .
 			'after'
 		);
 	}