Apply suggestions from code review

mukeshpanchal27 · felixarntz · web-flow · commit a36410d56d34 · 2025-01-16T10:31:50.000+05:30
Co-authored-by: Felix Arntz &lt;flixos90@gmail.com&gt;
diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php
@@ -554,11 +554,13 @@ public function render( $options = array() ) {
 						/** This filter is documented in wp-includes/blocks.php */
 						$inner_block->context = apply_filters( 'render_block_context', $inner_block->context, $inner_block->parsed_block, $parent_block );
 
+						/*
+						 * The `refresh_context_dependents()` method already calls `refresh_parsed_block_dependents()`.
+						 * Therefore the second condition is irrelevant if the first one is satisfied.
+						 */
 						if ( $inner_block->context !== $inner_block_context ) {
 							$inner_block->refresh_context_dependents();
-						}
-
-						if ( $inner_block->parsed_block !== $source_block ) {
+						} elseif ( $inner_block->parsed_block !== $source_block ) {
 							$inner_block->refresh_parsed_block_dependents();
 						}
 
diff --git a/tests/phpunit/tests/blocks/renderBlock.php b/tests/phpunit/tests/blocks/renderBlock.php
@@ -298,8 +298,7 @@ function ( $context, $parsed_block ) {
 <!-- wp:tests/context-consumer /-->
 HTML
 		);
-		$this->assertTrue( isset( $provided_context['arbitrary'] ), 'Test block is top-level block: Block context should include "arbitrary"' );
-		$this->assertSame( 'ok', $provided_context['arbitrary'], 'Test block is top-level block: "arbitrary" in context should be "ok"' );
+		$this->assertFalse( isset( $provided_context['arbitrary'] ), 'Test block is top-level block: Block context should not include "arbitrary"' );
 
 		do_blocks(
 			<<<HTML
@@ -308,6 +307,16 @@ function ( $context, $parsed_block ) {
 <!-- /wp:group -->
 HTML
 		);
+
+		/*
+		 * These assertions assert something that ideally should not be the case: Inner blocks should respect the
+		 * `uses_context` value just like top-level blocks do. However, due to logic in `WP_Block::render()`, the
+		 * `context` property value itself is filterable when it should rather only apply to the `available_context`
+		 * property.
+		 * However, changing this behavior now would be a backward compatibility break, hence the assertion here.
+		 * Potentially it can be reconsidered in the future, so that these two assertions could be replaced with an
+		 * `assertFalse( isset( $provided_context['arbitrary'] ) )`.
+		 */
 		$this->assertTrue( isset( $provided_context['arbitrary'] ), 'Test block is inner block: Block context should include "arbitrary"' );
 		$this->assertSame( 'ok', $provided_context['arbitrary'], 'Test block is inner block: "arbitrary" in context should be "ok"' );
 	}
