Add tests and other general doc updates

talldan · talldan · commit e6d9c3199959 · 2024-09-18T12:43:53.000+01:00
diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php
@@ -237,6 +237,7 @@ public function __get( $name ) {
 	 *
 	 * @since 6.5.0
 	 * @since 6.6.0 Handle the `__default` attribute for pattern overrides.
+	 * @since 6.7.0 Return any updated bindings metadata in the computed attributes.
 	 *
 	 * @return array The computed block attributes for the provided block bindings.
 	 */
@@ -310,8 +311,8 @@ private function process_block_bindings() {
 			}
 		}
 
-		// Update the bindings in the computed attributes.
-		// This ensures the block receives the expanded __default binding when it renders.
+		// Update the bindings metadata in the computed attributes.
+		// This ensures the block receives the expanded __default binding metadata when it renders.
 		$computed_attributes['metadata'] = array_merge(
 			$parsed_block['attrs']['metadata'],
 			array( 'bindings' => $bindings )
diff --git a/tests/phpunit/tests/block-bindings/render.php b/tests/phpunit/tests/block-bindings/render.php
@@ -272,31 +272,41 @@ public function test_using_symbols_in_block_bindings_value() {
 	}
 
 	/**
-	 * Tests if the `__default` attribute is replaced with real attribues for
+	 * Tests if the `__default` attribute is replaced with real attributes for
 	 * pattern overrides.
 	 *
 	 * @ticket 61333
+	 * @ticket 62069
 	 *
 	 * @covers WP_Block::process_block_bindings
 	 */
 	public function test_default_binding_for_pattern_overrides() {
-		$expected_content = 'This is the content value';
-
 		$block_content = <<<HTML
 <!-- wp:paragraph {"metadata":{"bindings":{"__default":{"source":"core/pattern-overrides"}},"name":"Test"}} -->
 <p>This should not appear</p>
 <!-- /wp:paragraph -->
 HTML;
 
-		$parsed_blocks = parse_blocks( $block_content );
-		$block         = new WP_Block( $parsed_blocks[0], array( 'pattern/overrides' => array( 'Test' => array( 'content' => $expected_content ) ) ) );
-		$result        = $block->render();
+		$expected_content = 'This is the content value';
+		$parsed_blocks    = parse_blocks( $block_content );
+		$block            = new WP_Block( $parsed_blocks[0], array( 'pattern/overrides' => array( 'Test' => array( 'content' => $expected_content ) ) ) );
+
+		$result = $block->render();
 
 		$this->assertSame(
 			"<p>$expected_content</p>",
 			trim( $result ),
 			'The `__default` attribute should be replaced with the real attribute prior to the callback.'
 		);
+
+		$expected_bindings_metadata = array(
+			'content' => array( 'source' => 'core/pattern-overrides' ),
+		);
+		$this->assertSame(
+			$expected_bindings_metadata,
+			$block->attributes['metadata']['bindings'],
+			'The __default binding should be updated with the individual binding attributes in the block metadata.'
+		);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,7 @@ public function __get( $name ) {`
`237`	`237`	`*`
`238`	`238`	`* @since 6.5.0`
`239`	`239`	* @since 6.6.0 Handle the `__default` attribute for pattern overrides.
	`240`	`+ * @since 6.7.0 Return any updated bindings metadata in the computed attributes.`
`240`	`241`	`*`
`241`	`242`	`* @return array The computed block attributes for the provided block bindings.`
`242`	`243`	`*/`
`@@ -310,8 +311,8 @@ private function process_block_bindings() {`
`310`	`311`	`}`
`311`	`312`	`}`
`312`	`313`
`313`		`- // Update the bindings in the computed attributes.`
`314`		`- // This ensures the block receives the expanded __default binding when it renders.`
	`314`	`+ // Update the bindings metadata in the computed attributes.`
	`315`	`+ // This ensures the block receives the expanded __default binding metadata when it renders.`
`315`	`316`	`$computed_attributes['metadata'] = array_merge(`
`316`	`317`	`$parsed_block['attrs']['metadata'],`
`317`	`318`	`array( 'bindings' => $bindings )`