Merge branch 'trunk' into fix/getchmod-error-handling

Author: westonruter

src/wp-admin/customize.php

@@ -147,6 +147,8 @@
 	$body_class .= ' rtl';
 }
 $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+$admin_color = get_user_option( 'admin_color' );
+$body_class .= ' admin-color-' . sanitize_html_class( is_string( $admin_color ) ? $admin_color : '', 'fresh' );
 
 if ( wp_use_widgets_block_editor() ) {
 	$body_class .= ' wp-embed-responsive';

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

@@ -590,7 +590,7 @@ public function install_package( $args = array() ) {
 		 * Filters the source file location for the upgrade package.
 		 *
 		 * @since 2.8.0
-		 * @since 4.4.0 The $hook_extra parameter became available.
+		 * @since 4.4.0 The `$hook_extra` parameter became available.
 		 *
 		 * @param string      $source        File source location.
 		 * @param string      $remote_source Remote file source location.

src/wp-admin/includes/post.php

@@ -1894,7 +1894,7 @@ function _admin_notice_post_locked() {
 		 * Fires inside the post locked dialog before the buttons are displayed.
 		 *
 		 * @since 3.6.0
-		 * @since 5.4.0 The $user parameter was added.
+		 * @since 5.4.0 The `$user` parameter was added.
 		 *
 		 * @param WP_Post $post Post object.
 		 * @param WP_User $user The user with the lock for the post.

src/wp-includes/abilities-api/class-wp-ability.php

@@ -277,13 +277,15 @@ protected function prepare_properties( array $args ): array {
 			);
 		}
 
-		if ( empty( $args['execute_callback'] ) || ! is_callable( $args['execute_callback'] ) ) {
+		// If we are not overriding `ability_class` parameter during instantiation, then we need to validate the execute_callback.
+		if ( get_class( $this ) === self::class && ( empty( $args['execute_callback'] ) || ! is_callable( $args['execute_callback'] ) ) ) {
 			throw new InvalidArgumentException(
 				__( 'The ability properties must contain a valid `execute_callback` function.' )
 			);
 		}
 
-		if ( empty( $args['permission_callback'] ) || ! is_callable( $args['permission_callback'] ) ) {
+		// If we are not overriding `ability_class` parameter during instantiation, then we need to validate the permission_callback.
+		if ( get_class( $this ) === self::class && ( empty( $args['permission_callback'] ) || ! is_callable( $args['permission_callback'] ) ) ) {
 			throw new InvalidArgumentException(
 				__( 'The ability properties must provide a valid `permission_callback` function.' )
 			);

src/wp-includes/class-wp-customize-setting.php

@@ -765,7 +765,7 @@ public function value() {
 			 * functions for available hooks.
 			 *
 			 * @since 3.4.0
-			 * @since 4.6.0 Added the `$this` setting instance as the second parameter.
+			 * @since 4.6.0 Added the `$setting` instance as the second parameter.
 			 *
 			 * @param mixed                $default_value The setting default value. Default empty.
 			 * @param WP_Customize_Setting $setting       The setting instance.

src/wp-includes/class-wp-image-editor.php

@@ -255,7 +255,7 @@ public function set_quality( $quality = null, $dims = array() ) {
 			 * The WP_Image_Editor::set_quality() method has priority over the filter.
 			 *
 			 * @since 3.5.0
-			 * @since 6.8.0 Added the size parameter.
+			 * @since 6.8.0 Added the `$size` parameter.
 			 *
 			 * @param int    $quality   Quality level between 1 (low) and 100 (high).
 			 * @param string $mime_type Image mime type.

src/wp-includes/class-wp-query.php

@@ -1900,8 +1900,8 @@ public function get_posts() {
 		 * Fires after the query variable object is created, but before the actual query is run.
 		 *
 		 * Note: If using conditional tags, use the method versions within the passed instance
-		 * (e.g. $this->is_main_query() instead of is_main_query()). This is because the functions
-		 * like is_main_query() test against the global $wp_query instance, not the passed one.
+		 * (e.g. `$query->is_main_query()` instead of `is_main_query()`). This is because the functions
+		 * like `is_main_query()` test against the global `$wp_query` instance, not the passed one.
 		 *
 		 * @since 2.0.0
 		 *

src/wp-includes/class-wp-scripts.php

@@ -22,23 +22,26 @@ class WP_Scripts extends WP_Dependencies {
 	 * Full URL with trailing slash.
 	 *
 	 * @since 2.6.0
-	 * @var string
+	 * @see wp_default_scripts()
+	 * @var string|null
 	 */
 	public $base_url;
 
 	/**
 	 * URL of the content directory.
 	 *
 	 * @since 2.8.0
-	 * @var string
+	 * @see wp_default_scripts()
+	 * @var string|null
 	 */
 	public $content_url;
 
 	/**
 	 * Default version string for scripts.
 	 *
 	 * @since 2.6.0
-	 * @var string
+	 * @see wp_default_scripts()
+	 * @var string|null
 	 */
 	public $default_version;
 
@@ -118,6 +121,7 @@ class WP_Scripts extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
+	 * @see wp_default_scripts()
 	 * @var string[]|null
 	 */
 	public $default_dirs;
@@ -413,9 +417,19 @@ public function do_item( $handle, $group = false ) {
 			$src = $this->base_url . $src;
 		}
 
-		if ( ! empty( $ver ) ) {
-			$src = add_query_arg( 'ver', $ver, $src );
+		$query_args = array();
+		if ( empty( $obj->ver ) && null !== $obj->ver && is_string( $this->default_version ) ) {
+			$query_args['ver'] = $this->default_version;
+		} elseif ( is_scalar( $obj->ver ) ) {
+			$query_args['ver'] = (string) $obj->ver;
+		}
+		if ( isset( $this->args[ $handle ] ) ) {
+			parse_str( $this->args[ $handle ], $parsed_args );
+			if ( $parsed_args ) {
+				$query_args = array_merge( $query_args, $parsed_args );
+			}
 		}
+		$src = add_query_arg( rawurlencode_deep( $query_args ), $src );
 
 		/** This filter is documented in wp-includes/class-wp-scripts.php */
 		$src = esc_url_raw( apply_filters( 'script_loader_src', $src, $handle ) );

src/wp-includes/class-wp-styles.php

@@ -22,30 +22,34 @@ class WP_Styles extends WP_Dependencies {
 	 * Full URL with trailing slash.
 	 *
 	 * @since 2.6.0
-	 * @var string
+	 * @see wp_default_styles()
+	 * @var string|null
 	 */
 	public $base_url;
 
 	/**
 	 * URL of the content directory.
 	 *
 	 * @since 2.8.0
-	 * @var string
+	 * @see wp_default_styles()
+	 * @var string|null
 	 */
 	public $content_url;
 
 	/**
 	 * Default version string for stylesheets.
 	 *
 	 * @since 2.6.0
-	 * @var string
+	 * @see wp_default_styles()
+	 * @var string|null
 	 */
 	public $default_version;
 
 	/**
 	 * The current text direction.
 	 *
 	 * @since 2.6.0
+	 * @see wp_default_styles()
 	 * @var string
 	 */
 	public $text_direction = 'ltr';
@@ -96,6 +100,7 @@ class WP_Styles extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
+	 * @see wp_default_styles()
 	 * @var string[]|null
 	 */
 	public $default_dirs;
@@ -118,9 +123,15 @@ class WP_Styles extends WP_Dependencies {
 	 */
 	public function __construct() {
 		if (
-			function_exists( 'is_admin' ) && ! is_admin()
-		&&
-			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' )
+			(
+				function_exists( 'is_admin' ) &&
+				! is_admin()
+			)
+			&&
+			(
+				function_exists( 'current_theme_supports' ) &&
+				! current_theme_supports( 'html5', 'style' )
+			)
 		) {
 			$this->type_attr = " type='text/css'";
 		}
@@ -212,7 +223,7 @@ public function do_item( $handle, $group = false ) {
 			return true;
 		}
 
-		$href = $this->_css_href( $src, $ver, $handle );
+		$href = $this->_css_href( $src, $obj->ver, $handle );
 		if ( ! $href ) {
 			return true;
 		}
@@ -419,19 +430,29 @@ public function all_deps( $handles, $recursion = false, $group = false ) {
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param string $src    The source of the enqueued style.
-	 * @param string $ver    The version of the enqueued style.
-	 * @param string $handle The style's registered handle.
+	 * @param string            $src    The source of the enqueued style.
+	 * @param string|false|null $ver    The version of the enqueued style.
+	 * @param string            $handle The style's registered handle.
 	 * @return string Style's fully-qualified URL.
 	 */
 	public function _css_href( $src, $ver, $handle ) {
 		if ( ! is_bool( $src ) && ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && str_starts_with( $src, $this->content_url ) ) ) {
 			$src = $this->base_url . $src;
 		}
 
-		if ( ! empty( $ver ) ) {
-			$src = add_query_arg( 'ver', $ver, $src );
+		$query_args = array();
+		if ( empty( $ver ) && null !== $ver && is_string( $this->default_version ) ) {
+			$query_args['ver'] = $this->default_version;
+		} elseif ( is_scalar( $ver ) ) {
+			$query_args['ver'] = (string) $ver;
+		}
+		if ( isset( $this->args[ $handle ] ) ) {
+			parse_str( $this->args[ $handle ], $parsed_args );
+			if ( $parsed_args ) {
+				$query_args = array_merge( $query_args, $parsed_args );
+			}
 		}
+		$src = add_query_arg( rawurlencode_deep( $query_args ), $src );
 
 		/**
 		 * Filters an enqueued style's fully-qualified URL.

src/wp-includes/class-wp-user-query.php

@@ -851,7 +851,7 @@ public function query() {
 					 * Filters SELECT FOUND_ROWS() query for the current WP_User_Query instance.
 					 *
 					 * @since 3.2.0
-					 * @since 5.1.0 Added the `$this` parameter.
+					 * @since 5.1.0 Added the `$query` parameter.
 					 *
 					 * @global wpdb $wpdb WordPress database abstraction object.
 					 *