Merge branch 'trunk' into collaboration/single-table

Author: josephfusco

src/wp-admin/css/common.css

@@ -3340,7 +3340,7 @@ img {
 .postbox .handle-order-higher:focus,
 .postbox .handle-order-lower:focus,
 .postbox .handlediv:focus {
-	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color);
+	box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color);
 	border-radius: 50%;
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;

src/wp-admin/css/install.css

@@ -16,16 +16,16 @@ body {
 }
 
 a {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 a:hover,
 a:active {
-	color: #135e96;
+	color: var(--wp-admin-theme-color-darker-20);
 }
 
 a:focus {
-	color: #043959;
+	color: var(--wp-admin-theme-color-darker-20);
 	border-radius: 2px;
 	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);
 	/* Only visible in Windows High Contrast mode */

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

@@ -502,15 +502,27 @@ public function validate_input( $input = null ) {
 	 *
 	 * @param callable $callback The callable to invoke.
 	 * @param mixed    $input    Optional. The input data for the ability. Default `null`.
-	 * @return mixed The result of the callable execution.
+	 * @return mixed The result of the callable execution, or a `WP_Error` if the callback threw.
 	 */
 	protected function invoke_callback( callable $callback, $input = null ) {
 		$args = array();
 		if ( ! empty( $this->get_input_schema() ) ) {
 			$args[] = $input;
 		}
 
-		return $callback( ...$args );
+		try {
+			return $callback( ...$args );
+		} catch ( Throwable $e ) {
+			return new WP_Error(
+				'ability_callback_exception',
+				sprintf(
+					/* translators: 1: Ability name, 2: Exception message. */
+					__( 'Ability "%1$s" callback threw an exception: %2$s' ),
+					esc_html( $this->name ),
+					esc_html( $e->getMessage() )
+				)
+			);
+		}
 	}
 
 	/**

src/wp-includes/ai-client.php

@@ -17,20 +17,22 @@
  * @return bool Whether AI features are supported.
  */
 function wp_supports_ai(): bool {
-	$is_enabled = defined( 'WP_AI_SUPPORT' ) ? WP_AI_SUPPORT : true;
+	// Return early if AI is disabled by the current environment.
+	if ( defined( 'WP_AI_SUPPORT' ) && ! WP_AI_SUPPORT ) {
+		return false;
+	}
 
 	/**
-	 * Filters whether the current request should use AI.
+	 * Filters whether the current request can use AI.
 	 *
 	 * This allows plugins and 3rd-party code to disable AI features on a per-request basis, or to even override explicit
 	 * preferences defined by the site owner.
 	 *
 	 * @since 7.0.0
 	 *
-	 * @param bool $is_enabled Whether the current request should use AI. Default to WP_AI_SUPPORT constant, or true if
-	 *                         the constant is not defined.
+	 * @param bool $is_enabled Whether AI is available. Default to true.
 	 */
-	return (bool) apply_filters( 'wp_supports_ai', $is_enabled );
+	return (bool) apply_filters( 'wp_supports_ai', true );
 }
 
 /**

src/wp-includes/functions.php

@@ -3975,14 +3975,14 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 			font-size: 14px ;
 		}
 		a {
-			color: #2271b1;
+			color: #3858e9;
 		}
 		a:hover,
 		a:active {
-			color: #135e96;
+			color: #183ad6;
 		}
 		a:focus {
-			color: #043959;
+			color: #183ad6;
 			box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);
 			outline: 2px solid transparent;
 		}

tests/phpunit/tests/abilities-api/wpAbility.php

@@ -497,6 +497,54 @@ public function test_execute_no_input() {
 		$this->assertSame( 42, $ability->execute() );
 	}
 
+	/**
+	 * Tests that an exception thrown by the execute callback is converted to a WP_Error
+	 * instead of being propagated as an uncaught throwable.
+	 *
+	 * @ticket 65058
+	 */
+	public function test_execute_catches_callback_exception() {
+		$args = array_merge(
+			self::$test_ability_properties,
+			array(
+				'execute_callback' => static function (): int {
+					throw new RuntimeException( 'boom' );
+				},
+			)
+		);
+
+		$ability = new WP_Ability( self::$test_ability_name, $args );
+		$result  = $ability->execute();
+
+		$this->assertWPError( $result, 'Ability::execute() should return WP_Error when the callback throws.' );
+		$this->assertSame( 'ability_callback_exception', $result->get_error_code() );
+		$this->assertStringContainsString( 'boom', $result->get_error_message() );
+	}
+
+	/**
+	 * Tests that an exception thrown by the permission callback is converted to a WP_Error
+	 * instead of being propagated as an uncaught throwable.
+	 *
+	 * @ticket 65058
+	 */
+	public function test_check_permissions_catches_callback_exception() {
+		$args = array_merge(
+			self::$test_ability_properties,
+			array(
+				'permission_callback' => static function (): bool {
+					throw new RuntimeException( 'permission exploded' );
+				},
+			)
+		);
+
+		$ability = new WP_Ability( self::$test_ability_name, $args );
+		$result  = $ability->check_permissions();
+
+		$this->assertWPError( $result, 'Ability::check_permissions() should return WP_Error when the callback throws.' );
+		$this->assertSame( 'ability_callback_exception', $result->get_error_code() );
+		$this->assertStringContainsString( 'permission exploded', $result->get_error_message() );
+	}
+
 	/**
 	 * Tests that before_execute_ability action is fired with correct parameters.
 	 *

tests/phpunit/tests/admin/includesTheme.php

@@ -241,7 +241,6 @@ public function test_get_theme_featured_list_api() {
 	 *
 	 * Differences in the structure can also trigger failure by causing PHP notices/warnings.
 	 *
-	 * @group external-http
 	 * @ticket 28121
 	 */
 	public function test_get_theme_featured_list_hardcoded() {

tests/phpunit/tests/multisite/getBlogDetails.php

@@ -5,6 +5,8 @@
  * @group ms-required
  * @group ms-site
  * @group multisite
+ *
+ * @covers ::get_blog_details
  */
 class Tests_Multisite_GetBlogDetails extends WP_UnitTestCase {
 

tests/phpunit/tests/multisite/updateBlogDetails.php

@@ -4,6 +4,8 @@
  * @group ms-required
  * @group ms-site
  * @group multisite
+ *
+ * @covers ::update_blog_details
  */
 class Tests_Multisite_UpdateBlogDetails extends WP_UnitTestCase {
 

tests/phpunit/tests/multisite/updateBlogStatus.php

@@ -4,6 +4,8 @@
  * @group ms-required
  * @group ms-site
  * @group multisite
+ *
+ * @covers ::update_blog_status
  */
 class Tests_Multisite_UpdateBlogStatus extends WP_UnitTestCase {