Block Support: Change block visibility support key

Author: t-hamano

src/wp-includes/block-supports/block-visibility.php

@@ -19,11 +19,11 @@
 function wp_render_block_visibility_support( $block_content, $block ) {
 	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
 
-	if ( ! $block_type || ! block_has_support( $block_type, 'blockVisibility', true ) ) {
+	if ( ! $block_type || ! block_has_support( $block_type, 'visibility', true ) ) {
 		return $block_content;
 	}
 
-	if ( isset( $block['attrs']['metadata']['blockVisibility'] ) && false === $block['attrs']['metadata']['blockVisibility'] ) {
+	if ( isset( $block['attrs']['metadata']['visibility'] ) && false === $block['attrs']['metadata']['visibility'] ) {
 		return '';
 	}
 

tests/phpunit/tests/block-supports/block-visibility.php

@@ -56,55 +56,55 @@ private function register_visibility_block_with_support( $block_name, $supports
 
 	/**
 	 * Tests that block visibility support renders empty string when block is hidden
-	 * and blockVisibility support is opted in.
+	 * and visibility support is opted in.
 	 *
 	 * @ticket 64061
 	 */
 	public function test_block_visibility_support_hides_block_when_visibility_false() {
 		$block_type = $this->register_visibility_block_with_support(
 			'test/visibility-block',
-			array( 'blockVisibility' => true )
+			array( 'visibility' => true )
 		);
 
 		$block_content = '<p>This is a test block.</p>';
 		$block         = array(
 			'blockName' => 'test/visibility-block',
 			'attrs'     => array(
 				'metadata' => array(
-					'blockVisibility' => false,
+					'visibility' => false,
 				),
 			),
 		);
 
 		$result = wp_render_block_visibility_support( $block_content, $block );
 
-		$this->assertSame( '', $result, 'Block content should be empty when blockVisibility is false and support is opted in.' );
+		$this->assertSame( '', $result, 'Block content should be empty when visibility is false and support is opted in.' );
 	}
 
 	/**
 	 * Tests that block visibility support renders block normally when visibility is false
-	 * but blockVisibility support is not opted in.
+	 * but visibility support is not opted in.
 	 *
 	 * @ticket 64061
 	 */
 	public function test_block_visibility_support_shows_block_when_support_not_opted_in() {
 		$block_type = $this->register_visibility_block_with_support(
 			'test/visibility-block',
-			array( 'blockVisibility' => false )
+			array( 'visibility' => false )
 		);
 
 		$block_content = '<p>This is a test block.</p>';
 		$block         = array(
 			'blockName' => 'test/visibility-block',
 			'attrs'     => array(
 				'metadata' => array(
-					'blockVisibility' => false,
+					'visibility' => false,
 				),
 			),
 		);
 
 		$result = wp_render_block_visibility_support( $block_content, $block );
 
-		$this->assertSame( $block_content, $result, 'Block content should remain unchanged when blockVisibility support is not opted in.' );
+		$this->assertSame( $block_content, $result, 'Block content should remain unchanged when visibility support is not opted in.' );
 	}
 }