Merge branch 'trunk' into html-api/auto-escape-javascript-json

Author: sirreal

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-styles.php

@@ -118,9 +118,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'";
 		}

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

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

@@ -654,7 +654,7 @@ public function set_role( $role ) {
 		 * Fires after the user's role has changed.
 		 *
 		 * @since 2.9.0
-		 * @since 3.6.0 Added $old_roles to include an array of the user's previous roles.
+		 * @since 3.6.0 Added `$old_roles` to include an array of the user's previous roles.
 		 *
 		 * @param int      $user_id   The user ID.
 		 * @param string   $role      The new role.

src/wp-includes/comment.php

@@ -598,7 +598,7 @@ function wp_set_comment_cookies( $comment, $user, $cookies_consent = true ) {
 	 * Filters the lifetime of the comment cookie in seconds.
 	 *
 	 * @since 2.8.0
-	 * @since 6.6.0 The default $seconds value changed from 30000000 to YEAR_IN_SECONDS.
+	 * @since 6.6.0 The default `$seconds` value changed from 30000000 to YEAR_IN_SECONDS.
 	 *
 	 * @param int $seconds Comment cookie lifetime. Default YEAR_IN_SECONDS.
 	 */