Merge branch 'trunk' into docs/nullable-props

Author: westonruter

Gruntfile.js

@@ -59,6 +59,22 @@ module.exports = function(grunt) {
 			'!wp-includes/assets/script-modules-packages.min.php',
 		],
 
+		// All workflow files that should be deleted from non-default branches.
+		workflowFiles = [
+			// Reusable workflows should be called from `trunk` within branches.
+			'.github/workflows/reusable-*.yml',
+			// These workflows are only intended to run from `trunk`.
+			'.github/workflows/commit-built-file-changes.yml',
+			'.github/workflows/failed-workflow.yml',
+			'.github/workflows/install-testing.yml',
+			'.github/workflows/test-and-zip-default-themes.yml',
+			'.github/workflows/install-testing.yml',
+			'.github/workflows/slack-notifications.yml',
+			'.github/workflows/test-coverage.yml',
+			'.github/workflows/test-old-branches.yml',
+			'.github/workflows/upgrade-testing.yml'
+		],
+
 		// Prepend `dir` to `file`, and keep `!` in place.
 		setFilePath = function( dir, file ) {
 			if ( '!' === file.charAt( 0 ) ) {
@@ -216,7 +232,18 @@ module.exports = function(grunt) {
 				cwd: WORKING_DIR,
 				src: []
 			},
-			qunit: ['tests/qunit/compiled.html']
+			qunit: ['tests/qunit/compiled.html'],
+
+			// This is only meant to run within a numbered branch after branching has occurred.
+			workflows: {
+				filter: function() {
+					var allowedTasks = [ 'post-branching', 'clean:workflows' ];
+					return allowedTasks.some( function( task ) {
+						return grunt.cli.tasks.indexOf( task ) !== -1;
+					} );
+				},
+				src: workflowFiles
+			},
 		},
 		file_append: {
 			// grunt-file-append supports only strings for input and output.
@@ -1708,6 +1735,11 @@ module.exports = function(grunt) {
 		'copy:workflow-references-remote-to-local',
 	]);
 
+	grunt.registerTask( 'post-branching', [
+		'clean:workflows',
+		'replace:workflow-references-local-to-remote'
+	]);
+
 	/**
 	 * Build verification tasks.
 	 */

src/wp-admin/includes/image.php

@@ -827,7 +827,13 @@ function wp_read_image_metadata( $file ) {
 		return false;
 	}
 
-	list( , , $image_type ) = wp_getimagesize( $file );
+	$image_size = wp_getimagesize( $file );
+
+	if ( false === $image_size ) {
+		return false;
+	}
+
+	list( , , $image_type ) = $image_size;
 
 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways

src/wp-admin/includes/taxonomy.php

@@ -48,19 +48,19 @@ function get_category_to_edit( $id ) {
  *
  * @since 2.0.0
  *
- * @param int|string $cat_name        Category name.
- * @param int        $category_parent Optional. ID of parent category.
- * @return int|WP_Error
+ * @param string $category_name   Category name.
+ * @param int    $category_parent Optional. ID of parent category.
+ * @return int The ID of category term on success, or zero on failure.
  */
-function wp_create_category( $cat_name, $category_parent = 0 ) {
-	$id = category_exists( $cat_name, $category_parent );
+function wp_create_category( $category_name, $category_parent = 0 ) {
+	$id = category_exists( $category_name, $category_parent );
 	if ( $id ) {
-		return $id;
+		return (int) $id;
 	}
 
 	return wp_insert_category(
 		array(
-			'cat_name'        => $cat_name,
+			'cat_name'        => $category_name,
 			'category_parent' => $category_parent,
 		)
 	);

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

@@ -436,6 +436,10 @@
 			}
 		}
 
+		&.has-text-color cite {
+			color: inherit;
+		}
+
 		&.is-style-solid-color {
 			background-color: $color__link;
 			padding-left: 0;

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

@@ -1103,6 +1103,12 @@ figcaption,
   color: #767676;
 }
 
+.wp-block-pullquote.has-text-color .wp-block-pullquote__citation,
+.wp-block-pullquote.has-primary-background-color blockquote p,
+.wp-block-pullquote.has-dark-gray-background-color blockquote p {
+  color: inherit;
+}
+
 .wp-block-pullquote.is-style-solid-color blockquote {
   width: calc(100% - (2 * 1rem));
   max-width: calc( 100% - (2 * 1rem));

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

@@ -515,6 +515,12 @@ figcaption,
 		color: $color__text-light;
 	}
 
+	&.has-text-color .wp-block-pullquote__citation,
+	&.has-primary-background-color blockquote p,
+	&.has-dark-gray-background-color blockquote p {
+		color: inherit;
+	}
+
 	&.is-style-solid-color {
 
 		blockquote {

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

@@ -5758,6 +5758,10 @@ body.page .main-navigation {
   margin-top: 0;
 }
 
+.entry .entry-content .wp-block-pullquote.has-text-color cite {
+  color: inherit;
+}
+
 .entry .entry-content .wp-block-pullquote.is-style-solid-color {
   background-color: #0073aa;
   padding-right: 0;

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

@@ -5770,6 +5770,10 @@ body.page .main-navigation {
   margin-top: 0;
 }
 
+.entry .entry-content .wp-block-pullquote.has-text-color cite {
+  color: inherit;
+}
+
 .entry .entry-content .wp-block-pullquote.is-style-solid-color {
   background-color: #0073aa;
   padding-left: 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;
 	}
 

src/wp-includes/class-wp-block-processor.php

@@ -194,7 +194,7 @@
  * block, and re-serialize it into the original document. It’s possible to do so
  * while skipping over the parse of the rest of the document.
  *
- * {@see self::extract_block()} will scan forward from the current block opener
+ * {@see self::extract_full_block_and_advance()} will scan forward from the current block opener
  * and build the parsed block structure until the current block is closed. It will
  * include all inner HTML and inner blocks, and parse all of the inner blocks. It
  * can be used to extract a block at any depth in the document, helpful for operating
@@ -207,7 +207,7 @@
  *     }
  *
  *     $gallery_at    = $processor->get_span()->start;
- *     $gallery_block = $processor->extract_block();
+ *     $gallery_block = $processor->extract_full_block_and_advance();
  *     $after_gallery = $processor->get_span()->start;
  *     return (
  *         substr( $post_content, 0, $gallery_at ) .
@@ -1223,7 +1223,7 @@ public function get_depth(): int {
 	 *     }
 	 *
 	 *     $gallery_at  = $processor->get_span()->start;
-	 *     $gallery     = $processor->extract_block();
+	 *     $gallery     = $processor->extract_full_block_and_advance();
 	 *     $ends_before = $processor->get_span();
 	 *     $ends_before = $ends_before->start ?? strlen( $post_content );
 	 *
@@ -1254,7 +1254,7 @@ public function get_depth(): int {
 	 *     }
 	 * }
 	 */
-	public function extract_block(): ?array {
+	public function extract_full_block_and_advance(): ?array {
 		if ( $this->is_html() ) {
 			$chunk = $this->get_html_content();
 
@@ -1291,7 +1291,7 @@ public function extract_block(): ?array {
 			 * @todo Use iteration instead of recursion, or at least refactor to tail-call form.
 			 */
 			if ( $this->opens_block() ) {
-				$inner_block             = $this->extract_block();
+				$inner_block             = $this->extract_full_block_and_advance();
 				$block['innerBlocks'][]  = $inner_block;
 				$block['innerContent'][] = null;
 			}