Make the PHP implementation of the replacement of default attributes …

…more generic (not implemented in the pattern block)

lib/compat/wordpress-6.6/blocks.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Temporary compatibility shims for block APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Replace the `__default` block bindings attribute with the full list of supported
+ * attribute names for pattern overrides.
+ *
+ * @param array $parsed_block The full block, including name and attributes.
+ *
+ * @return string The parsed block with default binding replace.
+ */
+function gutenberg_replace_pattern_override_default_binding( $parsed_block ) {
+	$supported_block_attrs = array(
+		'core/paragraph' => array( 'content' ),
+		'core/heading'   => array( 'content' ),
+		'core/image'     => array( 'id', 'url', 'title', 'alt' ),
+		'core/button'    => array( 'url', 'text', 'linkTarget', 'rel' ),
+	);
+
+	$bindings = $parsed_block['attrs']['metadata']['bindings'] ?? array();
+	if (
+		isset( $bindings[ '__default' ][ 'source' ] ) &&
+		$bindings[ '__default' ][ 'source' ] === 'core/pattern-overrides'
+	) {
+		// Build an binding array of all supported attributes.
+		foreach ( $supported_block_attrs[ $parsed_block['blockName'] ] as $attribute_name ) {
+			$bindings[ $attribute_name ] = array( 'source' => 'core/pattern-overrides' );
+		}
+		// Merge this into the parsed block's bindings & avoid overwriting existing bindings.
+		$parsed_block['attrs']['metadata']['bindings'] = array_merge(
+			$bindings,
+			$parsed_block['attrs']['metadata']['bindings']
+		);
+	}
+
+	return $parsed_block;
+}
+
+add_filter( 'render_block_data', 'gutenberg_replace_pattern_override_default_binding', 10, 1 );

lib/load.php

@@ -131,6 +131,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 
 // WordPress 6.6 compat.
 require __DIR__ . '/compat/wordpress-6.6/admin-bar.php';
+require __DIR__ . '/compat/wordpress-6.6/blocks.php';
 require __DIR__ . '/compat/wordpress-6.6/compat.php';
 require __DIR__ . '/compat/wordpress-6.6/resolve-patterns.php';
 require __DIR__ . '/compat/wordpress-6.6/block-bindings/pattern-overrides.php';

packages/block-library/src/block/index.php

@@ -85,49 +85,13 @@ function render_block_core_block( $attributes ) {
 			return $context;
 		};
 		add_filter( 'render_block_context', $filter_block_context, 1 );
-
-		// Add bindings for the default pattern overrides source.
-		$apply_default_pattern_overrides_bindings = static function ( $parsed_block ) {
-			$supported_block_attrs = array(
-				'core/paragraph' => array( 'content' ),
-				'core/heading'   => array( 'content' ),
-				'core/image'     => array( 'id', 'url', 'title', 'alt' ),
-				'core/button'    => array( 'url', 'text', 'linkTarget', 'rel' ),
-			);
-
-			if (
-				// Return early if the block isn't one of the supported block types,
-				! isset( $supported_block_attrs[ $parsed_block['blockName'] ] ) ||
-				// or doesn't have a name,
-				! isset( $parsed_block['attrs']['metadata']['name'] ) ||
-				// or doesn't have the default binding.
-				empty( $parsed_block['attrs']['metadata']['bindings']['__default'] ) ||
-				// or the default binding isn't the pattern overrides source.
-				'core/pattern-overrides' !== $parsed_block['attrs']['metadata']['bindings']['__default']['source']
-			) {
-				return $parsed_block;
-			}
-
-			$bindings = array();
-			foreach ( $supported_block_attrs[ $parsed_block['blockName'] ] as $attribute_name ) {
-				$bindings[ $attribute_name ] = array( 'source' => 'core/pattern-overrides' );
-			}
-			$parsed_block['attrs']['metadata']['bindings'] = array_merge(
-				$bindings,
-				$parsed_block['attrs']['metadata']['bindings']
-			);
-
-			return $parsed_block;
-		};
-		add_filter( 'render_block_data', $apply_default_pattern_overrides_bindings );
 	}
 
 	$content = do_blocks( $content );
 	unset( $seen_refs[ $attributes['ref'] ] );
 
 	if ( $has_pattern_overrides ) {
 		remove_filter( 'render_block_context', $filter_block_context, 1 );
-		remove_filter( 'render_block_data', $apply_default_pattern_overrides_bindings );
 	}
 
 	return $content;