Merge branch 'trunk' into fix/65068-oembed-provider-validation

Author: Sukhendu2002

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 );
 }
 
 /**

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/blocks/wpBlockTypeRegistry.php

@@ -7,6 +7,8 @@
  * @since 5.0.0
  *
  * @group blocks
+ *
+ * @coversDefaultClass WP_Block_Type_Registry
  */
 class Tests_Blocks_wpBlockTypeRegistry extends WP_UnitTestCase {
 
@@ -41,57 +43,42 @@ public function tear_down() {
 	}
 
 	/**
-	 * Should reject numbers
+	 * Should reject invalid block names.
 	 *
 	 * @ticket 45097
 	 *
-	 * @expectedIncorrectUsage WP_Block_Type_Registry::register
-	 */
-	public function test_invalid_non_string_names() {
-		$result = $this->registry->register( 1, array() );
-		$this->assertFalse( $result );
-	}
-
-	/**
-	 * Should reject blocks without a namespace
+	 * @covers ::register
 	 *
-	 * @ticket 45097
+	 * @dataProvider data_invalid_block_names
 	 *
 	 * @expectedIncorrectUsage WP_Block_Type_Registry::register
 	 */
-	public function test_invalid_names_without_namespace() {
-		$result = $this->registry->register( 'paragraph', array() );
+	public function test_invalid_block_names( $name ) {
+		$result = $this->registry->register( $name, array() );
 		$this->assertFalse( $result );
 	}
 
 	/**
-	 * Should reject blocks with invalid characters
-	 *
-	 * @ticket 45097
+	 * Data provider for test_invalid_block_names().
 	 *
-	 * @expectedIncorrectUsage WP_Block_Type_Registry::register
+	 * @return array<string, array{ 0: mixed }>
 	 */
-	public function test_invalid_characters() {
-		$result = $this->registry->register( 'still/_doing_it_wrong', array() );
-		$this->assertFalse( $result );
+	public function data_invalid_block_names(): array {
+		return array(
+			'non-string name'      => array( 1 ),
+			'no namespace'         => array( 'paragraph' ),
+			'invalid characters'   => array( 'still/_doing_it_wrong' ),
+			'uppercase characters' => array( 'Core/Paragraph' ),
+		);
 	}
 
 	/**
-	 * Should reject blocks with uppercase characters
+	 * Should accept valid block names.
 	 *
 	 * @ticket 45097
 	 *
-	 * @expectedIncorrectUsage WP_Block_Type_Registry::register
-	 */
-	public function test_uppercase_characters() {
-		$result = $this->registry->register( 'Core/Paragraph', array() );
-		$this->assertFalse( $result );
-	}
-
-	/**
-	 * Should accept valid block names
-	 *
-	 * @ticket 45097
+	 * @covers ::register
+	 * @covers ::get_registered
 	 */
 	public function test_register_block_type() {
 		$name     = 'core/paragraph';
@@ -106,10 +93,12 @@ public function test_register_block_type() {
 	}
 
 	/**
-	 * Should fail to re-register the same block
+	 * Should fail to re-register the same block.
 	 *
 	 * @ticket 45097
 	 *
+	 * @covers ::register
+	 *
 	 * @expectedIncorrectUsage WP_Block_Type_Registry::register
 	 */
 	public function test_register_block_type_twice() {
@@ -125,9 +114,11 @@ public function test_register_block_type_twice() {
 	}
 
 	/**
-	 * Should accept a WP_Block_Type instance
+	 * Should accept a WP_Block_Type instance.
 	 *
 	 * @ticket 45097
+	 *
+	 * @covers ::register
 	 */
 	public function test_register_block_type_instance() {
 		$block_type = new WP_Fake_Block_Type( 'core/fake' );
@@ -137,10 +128,12 @@ public function test_register_block_type_instance() {
 	}
 
 	/**
-	 * Unregistering should fail if a block is not registered
+	 * Unregistering should fail if a block is not registered.
 	 *
 	 * @ticket 45097
 	 *
+	 * @covers ::unregister
+	 *
 	 * @expectedIncorrectUsage WP_Block_Type_Registry::unregister
 	 */
 	public function test_unregister_not_registered_block() {
@@ -149,9 +142,12 @@ public function test_unregister_not_registered_block() {
 	}
 
 	/**
-	 * Should unregister existing blocks
+	 * Should unregister existing blocks.
 	 *
 	 * @ticket 45097
+	 *
+	 * @covers ::unregister
+	 * @covers ::is_registered
 	 */
 	public function test_unregister_block_type() {
 		$name     = 'core/paragraph';
@@ -168,6 +164,8 @@ public function test_unregister_block_type() {
 
 	/**
 	 * @ticket 45097
+	 *
+	 * @covers ::get_all_registered
 	 */
 	public function test_get_all_registered() {
 		$names    = array( 'core/paragraph', 'core/image', 'core/blockquote' );

tests/phpunit/tests/link/getAdjacentPost.php

@@ -477,14 +477,14 @@ public function test_get_adjacent_post_term_array_processing_order() {
 
 		// Should find post_one (previous post that shares term1).
 		$this->assertInstanceOf( WP_Post::class, $result );
-		$this->assertEquals( $post1_id, $result->ID );
+		$this->assertSame( $post1_id, $result->ID );
 
 		// Test next post.
 		$result = get_adjacent_post( true, array( $term2_id ), false, 'wptests_tax' );
 
 		// Should find post_three (next post that shares term1).
 		$this->assertInstanceOf( WP_Post::class, $result );
-		$this->assertEquals( $post3_id, $result->ID );
+		$this->assertSame( $post3_id, $result->ID );
 	}
 
 	/**
@@ -614,12 +614,12 @@ public function test_get_adjacent_post_with_identical_dates() {
 		// Previous post should be the 2nd post (lower ID, same date).
 		$previous = get_adjacent_post( false, '', true );
 		$this->assertInstanceOf( 'WP_Post', $previous );
-		$this->assertEquals( $post_ids[1], $previous->ID );
+		$this->assertSame( $post_ids[1], $previous->ID );
 
 		// Next post should be the 4th post (higher ID, same date).
 		$next = get_adjacent_post( false, '', false );
 		$this->assertInstanceOf( 'WP_Post', $next );
-		$this->assertEquals( $post_ids[3], $next->ID );
+		$this->assertSame( $post_ids[3], $next->ID );
 	}
 
 	/**
@@ -661,38 +661,38 @@ public function test_get_adjacent_post_mixed_dates_with_identical_groups() {
 		// Previous should be the early post (different date).
 		$previous = get_adjacent_post( false, '', true );
 		$this->assertInstanceOf( 'WP_Post', $previous );
-		$this->assertEquals( $post_early, $previous->ID );
+		$this->assertSame( $post_early, $previous->ID );
 
 		// Next should be the second identical post (same date, higher ID).
 		$next = get_adjacent_post( false, '', false );
 		$this->assertInstanceOf( 'WP_Post', $next );
-		$this->assertEquals( $post_ids[1], $next->ID );
+		$this->assertSame( $post_ids[1], $next->ID );
 
 		// Test from middle identical post.
 		$this->go_to( get_permalink( $post_ids[1] ) );
 
 		// Previous should be the first identical post (same date, lower ID).
 		$previous = get_adjacent_post( false, '', true );
 		$this->assertInstanceOf( 'WP_Post', $previous );
-		$this->assertEquals( $post_ids[0], $previous->ID );
+		$this->assertSame( $post_ids[0], $previous->ID );
 
 		// Next should be the third identical post (same date, higher ID).
 		$next = get_adjacent_post( false, '', false );
 		$this->assertInstanceOf( 'WP_Post', $next );
-		$this->assertEquals( $post_ids[2], $next->ID );
+		$this->assertSame( $post_ids[2], $next->ID );
 
 		// Test from last identical post.
 		$this->go_to( get_permalink( $post_ids[2] ) );
 
 		// Previous should be the second identical post (same date, lower ID).
 		$previous = get_adjacent_post( false, '', true );
 		$this->assertInstanceOf( 'WP_Post', $previous );
-		$this->assertEquals( $post_ids[1], $previous->ID );
+		$this->assertSame( $post_ids[1], $previous->ID );
 
 		// Next should be the late post (different date).
 		$next = get_adjacent_post( false, '', false );
 		$this->assertInstanceOf( 'WP_Post', $next );
-		$this->assertEquals( $post_late, $next->ID );
+		$this->assertSame( $post_late, $next->ID );
 	}
 
 	/**
@@ -719,26 +719,26 @@ public function test_get_adjacent_post_navigation_through_identical_dates() {
 
 		// From post 1, next should be post 2.
 		$next = get_adjacent_post( false, '', false );
-		$this->assertEquals( $post_ids[1], $next->ID );
+		$this->assertSame( $post_ids[1], $next->ID );
 
 		// From post 2, previous should be post 1, next should be post 3.
 		$this->go_to( get_permalink( $post_ids[1] ) );
 		$previous = get_adjacent_post( false, '', true );
-		$this->assertEquals( $post_ids[0], $previous->ID );
+		$this->assertSame( $post_ids[0], $previous->ID );
 		$next = get_adjacent_post( false, '', false );
-		$this->assertEquals( $post_ids[2], $next->ID );
+		$this->assertSame( $post_ids[2], $next->ID );
 
 		// From post 3, previous should be post 2, next should be post 4.
 		$this->go_to( get_permalink( $post_ids[2] ) );
 		$previous = get_adjacent_post( false, '', true );
-		$this->assertEquals( $post_ids[1], $previous->ID );
+		$this->assertSame( $post_ids[1], $previous->ID );
 		$next = get_adjacent_post( false, '', false );
-		$this->assertEquals( $post_ids[3], $next->ID );
+		$this->assertSame( $post_ids[3], $next->ID );
 
 		// From post 4, previous should be post 3.
 		$this->go_to( get_permalink( $post_ids[3] ) );
 		$previous = get_adjacent_post( false, '', true );
-		$this->assertEquals( $post_ids[2], $previous->ID );
+		$this->assertSame( $post_ids[2], $previous->ID );
 	}
 
 	/**
@@ -777,6 +777,6 @@ public function test_get_adjacent_post_identical_dates_with_category() {
 
 		$next = get_adjacent_post( true, '', false, 'category' );
 		$this->assertInstanceOf( 'WP_Post', $next );
-		$this->assertEquals( $post_ids[3], $next->ID ); // Post 4 (in category)
+		$this->assertSame( $post_ids[3], $next->ID ); // Post 4 (in category)
 	}
 }

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 {