Merge branch 'trunk' into fix/wp_create_category-return-type

Author: westonruter

src/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss

@@ -804,6 +804,16 @@
 				outline-offset: -4px;
 			}
 		}
+
+		&.aligncenter .wp-block-file__button {
+			margin-left: auto;
+			margin-right: auto;
+		}
+
+		&.alignright .wp-block-file__button {
+			margin-left: auto;
+			margin-right: 0;
+		}
 	}
 
 	//! Code

src/wp-content/themes/twentynineteen/style-editor.css

@@ -1386,6 +1386,16 @@ ul.wp-block-archives li ul,
   text-align: center;
 }
 
+.wp-block[data-align="center"] .wp-block-file__button {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.wp-block[data-align="right"] .wp-block-file__button {
+  margin-left: auto;
+  margin-right: 0;
+}
+
 /** === Latest Posts === */
 .wp-block-latest-posts .wp-block-latest-posts__post-date {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;

src/wp-content/themes/twentynineteen/style-editor.scss

@@ -782,6 +782,16 @@ ul.wp-block-archives,
 	text-align: center;
 }
 
+.wp-block[data-align="center"] .wp-block-file__button {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.wp-block[data-align="right"] .wp-block-file__button {
+	margin-left: auto;
+	margin-right: 0;
+}
+
 /** === Latest Posts === */
 .wp-block-latest-posts {
 

src/wp-content/themes/twentynineteen/style-rtl.css

@@ -6208,6 +6208,16 @@ body.page .main-navigation {
   outline-offset: -4px;
 }
 
+.entry .entry-content .wp-block-file.aligncenter .wp-block-file__button {
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.entry .entry-content .wp-block-file.alignright .wp-block-file__button {
+  margin-right: auto;
+  margin-left: 0;
+}
+
 .entry .entry-content .wp-block-code {
   border-radius: 0;
 }

src/wp-content/themes/twentynineteen/style.css

@@ -6220,6 +6220,16 @@ body.page .main-navigation {
   outline-offset: -4px;
 }
 
+.entry .entry-content .wp-block-file.aligncenter .wp-block-file__button {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.entry .entry-content .wp-block-file.alignright .wp-block-file__button {
+  margin-left: auto;
+  margin-right: 0;
+}
+
 .entry .entry-content .wp-block-code {
   border-radius: 0;
 }

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

@@ -19,7 +19,7 @@
 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;
 	}
 

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

@@ -63,7 +63,7 @@ private function register_visibility_block_with_support( $block_name, $supports
 	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>';
@@ -90,7 +90,7 @@ public function test_block_visibility_support_hides_block_when_visibility_false(
 	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>';