Merge branch 'trunk' into feature/64229-warn-missing-dependencies

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.
 	 */

composer.json

@@ -20,8 +20,8 @@
 	},
 	"require-dev": {
 		"composer/ca-bundle": "1.5.9",
-		"squizlabs/php_codesniffer": "3.13.2",
-		"wp-coding-standards/wpcs": "~3.2.0",
+		"squizlabs/php_codesniffer": "3.13.5",
+		"wp-coding-standards/wpcs": "~3.3.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",
 		"yoast/phpunit-polyfills": "^1.1.0"
 	},

src/wp-admin/includes/ajax-actions.php

@@ -4804,6 +4804,8 @@ function wp_ajax_search_plugins() {
 	// Ensure after_plugin_row_{$plugin_file} gets hooked.
 	wp_plugin_update_rows();
 
+	WP_Plugin_Dependencies::initialize();
+
 	$pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
 	if ( 'plugins-network' === $pagenow || 'plugins' === $pagenow ) {
 		set_current_screen( $pagenow );

src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -299,7 +299,7 @@ public function chmod( $file, $mode = false, $recursive = false ) {
 	public function owner( $file ) {
 		$dir = $this->dirlist( $file );
 
-		return $dir[ $file ]['owner'];
+		return $dir[ $file ]['owner'] ?? '';
 	}
 
 	/**
@@ -313,7 +313,7 @@ public function owner( $file ) {
 	public function getchmod( $file ) {
 		$dir = $this->dirlist( $file );
 
-		return $dir[ $file ]['permsn'];
+		return $dir[ $file ]['permsn'] ?? '';
 	}
 
 	/**
@@ -327,7 +327,7 @@ public function getchmod( $file ) {
 	public function group( $file ) {
 		$dir = $this->dirlist( $file );
 
-		return $dir[ $file ]['group'];
+		return $dir[ $file ]['group'] ?? '';
 	}
 
 	/**

src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -309,7 +309,7 @@ public function chmod( $file, $mode = false, $recursive = false ) {
 	public function owner( $file ) {
 		$dir = $this->dirlist( $file );
 
-		return $dir[ $file ]['owner'];
+		return $dir[ $file ]['owner'] ?? '';
 	}
 
 	/**
@@ -323,7 +323,7 @@ public function owner( $file ) {
 	public function getchmod( $file ) {
 		$dir = $this->dirlist( $file );
 
-		return $dir[ $file ]['permsn'];
+		return $dir[ $file ]['permsn'] ?? '';
 	}
 
 	/**
@@ -337,7 +337,7 @@ public function getchmod( $file ) {
 	public function group( $file ) {
 		$dir = $this->dirlist( $file );
 
-		return $dir[ $file ]['group'];
+		return $dir[ $file ]['group'] ?? '';
 	}
 
 	/**

src/wp-admin/includes/class-wp-screen.php

@@ -175,8 +175,10 @@ final class WP_Screen {
 	/**
 	 * Stores the result of the public show_screen_options function.
 	 *
+	 * Set when calling {@see self::show_screen_options()} for the first time.
+	 *
 	 * @since 3.3.0
-	 * @var bool
+	 * @var ?bool
 	 */
 	private $_show_screen_options;
 
@@ -545,7 +547,7 @@ public function get_options() {
 	 * @param string       $option Option name.
 	 * @param string|false $key    Optional. Specific array key for when the option is an array.
 	 *                             Default false.
-	 * @return string The option value if set, null otherwise.
+	 * @return ?string The option value if set, null otherwise.
 	 */
 	public function get_option( $option, $key = false ) {
 		if ( ! isset( $this->_options[ $option ] ) ) {
@@ -598,7 +600,7 @@ public function get_help_tabs() {
 	 * @since 3.4.0
 	 *
 	 * @param string $id Help Tab ID.
-	 * @return array Help tab arguments.
+	 * @return ?array Help tab arguments, or null if no help tabs added.
 	 */
 	public function get_help_tab( $id ) {
 		if ( ! isset( $this->_help_tabs[ $id ] ) ) {
@@ -733,7 +735,7 @@ public function get_screen_reader_content() {
 	 * @since 4.4.0
 	 *
 	 * @param string $key Screen reader text array named key.
-	 * @return string Screen reader text string.
+	 * @return ?string Screen reader text string, or null if no text is associated with the key.
 	 */
 	public function get_screen_reader_text( $key ) {
 		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
@@ -949,8 +951,9 @@ public function render_screen_meta() {
 		if ( $this->get_option( 'layout_columns' ) ) {
 			$this->columns = (int) get_user_option( "screen_layout_$this->id" );
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) {
-				$this->columns = $this->get_option( 'layout_columns', 'default' );
+			$layout_columns = (int) $this->get_option( 'layout_columns', 'default' );
+			if ( ! $this->columns && $layout_columns ) {
+				$this->columns = $layout_columns;
 			}
 		}
 		$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.

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/media.php

@@ -2285,7 +2285,7 @@ function media_upload_form( $errors = null ) {
 			_ex( 'Upload', 'verb' );
 			?>
 		</label>
-		<input type="file" name="async-upload" id="async-upload" required />
+		<input type="file" name="async-upload" id="async-upload" />
 		<?php submit_button( _x( 'Upload', 'verb' ), 'primary', 'html-upload', false ); ?>
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
 	</p>

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-admin/network/sites.php

@@ -240,7 +240,7 @@
 								<?php
 								require_once ABSPATH . 'wp-admin/admin-footer.php';
 								exit;
-							break;
+							// By exiting, there's no longer a switch to break out of.
 
 							case 'spam':
 							case 'notspam':