From b847b9c4847582c738b73cf75c9b219e0851cac7 Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Tue, 12 Sep 2023 13:02:19 +0000 Subject: [PATCH] General: Add optional callback argument to serialize_block(s). Allow passing a function callback to serialize_block(s) that is invoked on each node in the tree of parsed blocks as it is traversed for serialization. A function argument was chosen for passing the callback function as it reflects a pattern familiar from other algorithms that apply a given callback function while traversing a data structure -- most notably PHP's own `array_map()`. Introducing a filter was considered as an alternative but ultimately dismissed. For a fairly low-level and general-purpose function such as `serialize_block()`, using a filter to pass the callback seemed risky, as it also requires ''removing'' that filter after usage in order to prevent the callback from being accidentally applied when `serialize_block()` is called in an entirely different context. Introducing a separate function for applying a given operation during tree traversal (i.e. independently of serialization) was also considered but dismissed, as it would unnecessarily duplicate tree traversal. Props dlh, gziolo. Fixes #59327. See #59313. Built from https://develop.svn.wordpress.org/trunk@56557 git-svn-id: http://core.svn.wordpress.org/trunk@56069 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks.php | 24 ++++++++++++++++++------ wp-includes/version.php | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php index 6fc72e358a..590f3706f7 100644 --- a/wp-includes/blocks.php +++ b/wp-includes/blocks.php @@ -794,16 +794,22 @@ function get_comment_delimited_block_content( $block_name, $block_attributes, $b * instead preserve the markup as parsed. * * @since 5.3.1 + * @since 6.4.0 The `$callback` parameter was added. * - * @param array $block A representative array of a single parsed block object. See WP_Block_Parser_Block. + * @param array $block A representative array of a single parsed block object. See WP_Block_Parser_Block. + * @param callable|null $callback Optional. Callback to run on each block in the tree before serialization. Default null. * @return string String of rendered HTML. */ -function serialize_block( $block ) { +function serialize_block( $block, $callback = null ) { + if ( is_callable( $callback ) ) { + $block = call_user_func( $callback, $block ); + } + $block_content = ''; $index = 0; foreach ( $block['innerContent'] as $chunk ) { - $block_content .= is_string( $chunk ) ? $chunk : serialize_block( $block['innerBlocks'][ $index++ ] ); + $block_content .= is_string( $chunk ) ? $chunk : serialize_block( $block['innerBlocks'][ $index++ ], $callback ); } if ( ! is_array( $block['attrs'] ) ) { @@ -822,12 +828,18 @@ function serialize_block( $block ) { * parsed blocks. * * @since 5.3.1 + * @since 6.4.0 The `$callback` parameter was added. * - * @param array[] $blocks An array of representative arrays of parsed block objects. See serialize_block(). + * @param array[] $blocks An array of representative arrays of parsed block objects. See serialize_block(). + * @param callable|null $callback Optional. Callback to run on each block in the tree before serialization. Default null. * @return string String of rendered HTML. */ -function serialize_blocks( $blocks ) { - return implode( '', array_map( 'serialize_block', $blocks ) ); +function serialize_blocks( $blocks, $callback = null ) { + $result = ''; + foreach ( $blocks as $block ) { + $result .= serialize_block( $block, $callback ); + }; + return $result; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index d6f18409d3..f0d9448613 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56556'; +$wp_version = '6.4-alpha-56557'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.