Merge branch 'trunk' into dependabot/npm_and_yarn/playwright/test-1.54.1

Author: mukeshpanchal27

plugins/auto-sizes/hooks.php

@@ -40,5 +40,6 @@ function auto_sizes_render_generator(): void {
 add_filter( 'the_content', 'auto_sizes_prime_attachment_caches', 9 ); // This must run before 'do_blocks', which runs at priority 9.
 add_filter( 'render_block_core/image', 'auto_sizes_filter_image_tag', 10, 3 );
 add_filter( 'render_block_core/cover', 'auto_sizes_filter_image_tag', 10, 3 );
+add_filter( 'render_block_core/post-featured-image', 'auto_sizes_filter_image_tag', 10, 3 );
 add_filter( 'get_block_type_uses_context', 'auto_sizes_filter_uses_context', 10, 2 );
 add_filter( 'render_block_context', 'auto_sizes_filter_render_block_context', 10, 3 );

plugins/auto-sizes/includes/improve-calculate-sizes.php

@@ -94,13 +94,20 @@ function auto_sizes_filter_image_tag( $content, array $parsed_block, WP_Block $b
 		 * @param string $size  The image size data.
 		 */
 		$filter = static function ( $sizes, $size ) use ( $block ) {
-
 			$id                       = isset( $block->attributes['id'] ) ? (int) $block->attributes['id'] : 0;
 			$alignment                = $block->attributes['align'] ?? '';
 			$width                    = isset( $block->attributes['width'] ) ? (int) $block->attributes['width'] : 0;
 			$max_alignment            = $block->context['max_alignment'] ?? '';
 			$container_relative_width = $block->context['container_relative_width'] ?? 1.0;
 
+			/*
+			 * For the post featured image block, use the post ID to get the featured image attachment ID.
+			 * See https://github.com/WordPress/wordpress-develop/blob/3f9c6fce666ed2ea0d56c21f6235c37db3d91392/src/wp-includes/blocks/post-featured-image.php#L65
+			 */
+			if ( 'core/post-featured-image' === $block->name && isset( $block->context['postId'] ) ) {
+				$id = auto_sizes_get_featured_image_attachment_id( $block->context['postId'] );
+			}
+
 			/*
 			 * Update width for cover block.
 			 * See https://github.com/WordPress/gutenberg/blob/938720602082dc50a1746bd2e33faa3d3a6096d4/packages/block-library/src/cover/style.scss#L82-L87.
@@ -118,12 +125,23 @@ function auto_sizes_filter_image_tag( $content, array $parsed_block, WP_Block $b
 		// Hook this filter early, before default filters are run.
 		add_filter( 'wp_calculate_image_sizes', $filter, 9, 2 );
 
+		// Get the image ID from the block attributes or context.
+		$id = $parsed_block['attrs']['id'] ?? 0;
+
+		/*
+		 * For the post featured image block, use the post ID to get the featured image attachment ID.
+		 * See https://github.com/WordPress/wordpress-develop/blob/3f9c6fce666ed2ea0d56c21f6235c37db3d91392/src/wp-includes/blocks/post-featured-image.php#L65
+		 */
+		if ( 'core/post-featured-image' === $block->name && isset( $block->context['postId'] ) ) {
+			$id = auto_sizes_get_featured_image_attachment_id( $block->context['postId'] );
+		}
+
 		$sizes = wp_calculate_image_sizes(
 			// If we don't have a size slug, assume the full size was used.
 			$parsed_block['attrs']['sizeSlug'] ?? 'full',
 			null,
 			null,
-			$parsed_block['attrs']['id'] ?? 0
+			$id
 		);
 
 		remove_filter( 'wp_calculate_image_sizes', $filter, 9 );
@@ -284,11 +302,12 @@ function auto_sizes_get_layout_width( string $alignment ): string {
 function auto_sizes_filter_uses_context( array $uses_context, WP_Block_Type $block_type ): array {
 	// Define block-specific context usage.
 	$block_specific_context = array(
-		'core/cover'   => array( 'max_alignment', 'container_relative_width' ),
-		'core/image'   => array( 'max_alignment', 'container_relative_width' ),
-		'core/group'   => array( 'max_alignment' ),
-		'core/columns' => array( 'max_alignment', 'container_relative_width' ),
-		'core/column'  => array( 'max_alignment', 'column_count' ),
+		'core/cover'               => array( 'max_alignment', 'container_relative_width' ),
+		'core/image'               => array( 'max_alignment', 'container_relative_width' ),
+		'core/post-featured-image' => array( 'max_alignment', 'container_relative_width' ),
+		'core/group'               => array( 'max_alignment' ),
+		'core/columns'             => array( 'max_alignment', 'container_relative_width' ),
+		'core/column'              => array( 'max_alignment', 'column_count' ),
 	);
 
 	if ( isset( $block_specific_context[ $block_type->name ] ) ) {
@@ -316,6 +335,7 @@ function auto_sizes_filter_render_block_context( array $context, array $block, ?
 	$provider_blocks = array(
 		'core/columns',
 		'core/group',
+		'core/post-featured-image',
 	);
 
 	if ( in_array( $block['blockName'], $provider_blocks, true ) ) {
@@ -360,3 +380,19 @@ function auto_sizes_filter_render_block_context( array $context, array $block, ?
 	}
 	return $context;
 }
+
+/**
+ * Retrieves the featured image attachment ID for a given post ID.
+ *
+ * @since n.e.x.t
+ *
+ * @param int $post_id The post ID.
+ * @return int The featured image attachment ID or 0 if not found.
+ */
+function auto_sizes_get_featured_image_attachment_id( int $post_id ): int {
+	if ( 0 === $post_id ) {
+		return 0;
+	}
+
+	return (int) get_post_thumbnail_id( $post_id );
+}

plugins/auto-sizes/tests/test-improve-calculate-sizes.php

@@ -15,6 +15,12 @@ class Tests_Improve_Calculate_Sizes extends WP_UnitTestCase {
 	 */
 	public static $image_id;
 
+	/**
+	 * Post ID.
+	 *
+	 * @var int
+	 */
+	public static $post_id;
 	/**
 	 * Set up the environment for the tests.
 	 */
@@ -24,6 +30,13 @@ public static function set_up_before_class(): void {
 		switch_theme( 'twentytwentyfour' );
 
 		self::$image_id = self::factory()->attachment->create_upload_object( TESTS_PLUGIN_DIR . '/tests/data/images/leaves.jpg' );
+
+		self::$post_id = self::factory()->post->create(
+			array(
+				'post_status' => 'publish',
+				'post_name'   => 'test-post',
+			)
+		);
 	}
 
 	public function set_up(): void {
@@ -108,7 +121,7 @@ public function test_image_block_with_wide_alignment( string $image_size ): void
 	 *
 	 * @return array<array<string>> The image sizes.
 	 */
-	public function data_image_sizes(): array {
+	public static function data_image_sizes(): array {
 		return array(
 			'Return full or wideSize 1280px instead of medium size 300px'  => array(
 				'medium',
@@ -164,7 +177,7 @@ public function test_image_block_with_default_alignment( string $image_size, str
 	 *
 	 * @return array<string, array<int, bool|string>> The image sizes.
 	 */
-	public function data_image_sizes_for_default_alignment(): array {
+	public static function data_image_sizes_for_default_alignment(): array {
 		return array(
 			'Return medium image size 300px instead of contentSize 620px'                          => array(
 				'medium',
@@ -239,7 +252,7 @@ public function test_image_block_with_left_right_center_alignment( string $image
 	 *
 	 * @return array<string, array<int, bool|string>> The image sizes and alignments.
 	 */
-	public function data_image_sizes_for_left_right_center_alignment(): array {
+	public static function data_image_sizes_for_left_right_center_alignment(): array {
 		return array(
 			'Return medium image size 300px with left alignment'                                    => array(
 				'medium',
@@ -369,7 +382,7 @@ public function test_cover_block_with_left_right_center_alignment( string $align
 	 *
 	 * @return array<array<string>> The image sizes.
 	 */
-	public function data_image_left_right_center_alignment(): array {
+	public static function data_image_left_right_center_alignment(): array {
 		return array(
 			array( 'left', 'sizes="(max-width: 420px) 100vw, 420px' ),
 			array( 'right', 'sizes="(max-width: 420px) 100vw, 420px' ),
@@ -417,7 +430,7 @@ public function test_ancestor_layout_is_passed_by_context( string $ancestor_bloc
 	 *
 	 * @return array<string, array<int, bool|string>> The ancestor and image alignments.
 	 */
-	public function data_ancestor_and_image_block_alignment(): array {
+	public static function data_ancestor_and_image_block_alignment(): array {
 		return array(
 			// Parent default alignment.
 			'Return contentSize 620px, parent block default alignment, image block default alignment' => array(
@@ -546,7 +559,7 @@ public function test_sizes_with_relative_layout_sizes( string $ancestor_alignmen
 	 *
 	 * @return array<string, array<int, bool|string>> The ancestor and image alignments.
 	 */
-	public function data_image_blocks_with_relative_alignment(): array {
+	public static function data_image_blocks_with_relative_alignment(): array {
 		return array(
 			// Parent default alignment.
 			'Return contentSize 50vw, parent block default alignment, image block default alignment' => array(
@@ -636,7 +649,7 @@ public function test_image_block_with_different_alignment_in_classic_theme( stri
 	 *
 	 * @return array<array<string>> The ancestor and image alignments.
 	 */
-	public function data_image_blocks_with_relative_alignment_for_classic_theme(): array {
+	public static function data_image_blocks_with_relative_alignment_for_classic_theme(): array {
 		return array(
 			array( '' ),
 			array( 'wide' ),
@@ -673,7 +686,7 @@ public function test_image_block_with_single_column_block( string $ancestor_bloc
 	 *
 	 * @return array<string, array<int, bool|string>> The ancestor and image alignments.
 	 */
-	public function data_image_block_with_column_block(): array {
+	public static function data_image_block_with_column_block(): array {
 		return array(
 			// Parent default alignment.
 			'Return contentSize 620px, parent block default alignment, image block default alignment' => array(
@@ -809,7 +822,7 @@ public function test_image_block_with_two_equal_column_block( string $ancestor_b
 	 *
 	 * @return array<string, array<int, bool|string>> The ancestor and image alignments.
 	 */
-	public function data_image_block_with_two_equal_column_block(): array {
+	public static function data_image_block_with_two_equal_column_block(): array {
 		return array(
 			// Parent default alignment.
 			'Return half size of contentSize 310px, parent block default alignment, image block default alignment' => array(
@@ -945,7 +958,7 @@ public function test_image_block_with_two_different_width_column_block( string $
 	 *
 	 * @return array<string, array<int, bool|string>> The ancestor and image alignments.
 	 */
-	public function data_image_block_with_two_different_width_column_block(): array {
+	public static function data_image_block_with_two_different_width_column_block(): array {
 		return array(
 			// Parent default alignment.
 			'Return 66.66% width of contentSize 413px, parent block default alignment, image block default alignment' => array(
@@ -1087,7 +1100,7 @@ public function test_image_block_with_parent_columns_and_its_parent_group_block(
 	 *
 	 * @return array<string, array<int, string>> The ancestor and image alignments.
 	 */
-	public function data_image_block_with_parent_columns_and_its_parent_group_block(): array {
+	public static function data_image_block_with_parent_columns_and_its_parent_group_block(): array {
 		return array(
 			// Parent default alignment.
 			'Return 66.66% width of contentSize 413px, group block default alignment, columns block default alignment, image block default alignment' => array(
@@ -1259,6 +1272,134 @@ public function data_image_block_with_parent_columns_and_its_parent_group_block(
 		);
 	}
 
+	/**
+	 * Verifies that the post featured image block does not render when no featured image is set for the post.
+	 */
+	public function test_post_featured_image_block_without_featured_image(): void {
+		$block_content = '<!-- wp:post-featured-image /-->';
+
+		// Set up global $post so 'the_content' filter works as expected.
+		global $post;
+		$post = get_post( self::$post_id );
+		setup_postdata( $post );
+
+		$result = apply_filters( 'the_content', $block_content );
+
+		$this->assertStringContainsString( '', $result );
+
+		wp_reset_postdata();
+	}
+
+	/**
+	 * Test that the post featured image block renders correctly with different image sizes.
+	 *
+	 * @dataProvider data_post_featured_image_block_image_sizes
+	 *
+	 * @param string $image_size Image size.
+	 * @param string $expected   Expected output.
+	 */
+	public function test_post_featured_image_block_with_different_image_size( string $image_size, string $expected ): void {
+		update_post_meta( self::$post_id, '_thumbnail_id', self::$image_id );
+
+		$block_content = '<!-- wp:post-featured-image {"sizeSlug":"' . $image_size . '"} /-->';
+
+		// Set up global $post so 'the_content' filter works as expected.
+		global $post;
+		$post = get_post( self::$post_id );
+		setup_postdata( $post );
+
+		$result = apply_filters( 'the_content', $block_content );
+
+		// Check that the featured image block renders the image and has a sizes attribute.
+		$this->assertStringContainsString( 'wp-block-post-featured-image', $result );
+		$this->assertStringContainsString( $expected, $result );
+
+		wp_reset_postdata();
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array<array<string>> The image sizes.
+	 */
+	public static function data_post_featured_image_block_image_sizes(): array {
+		return array(
+			'Return medium image size 300px' => array(
+				'medium',
+				'sizes="(max-width: 300px) 100vw, 300px" ',
+			),
+			'Return contentSize 620px instead of large size 1024px' => array(
+				'large',
+				'sizes="(max-width: 620px) 100vw, 620px" ',
+			),
+			'Return contentSize 620px instead of full size 1080px' => array(
+				'full',
+				'sizes="(max-width: 620px) 100vw, 620px" ',
+			),
+		);
+	}
+
+	/**
+	 * Test that the post featured image block renders correctly with different alignment.
+	 *
+	 * @dataProvider data_post_featured_image_block_alignment
+	 *
+	 * @param string $alignment Alignment of the image.
+	 * @param string $expected  Expected output.
+	 */
+	public function test_post_featured_image_block_with_different_alignment( string $alignment, string $expected ): void {
+		update_post_meta( self::$post_id, '_thumbnail_id', self::$image_id );
+
+		$block_content = '<!-- wp:post-featured-image {"align":"' . $alignment . '"} /-->';
+
+		// Set up global $post so 'the_content' filter works as expected.
+		global $post;
+		$post = get_post( self::$post_id );
+		setup_postdata( $post );
+
+		$result = apply_filters( 'the_content', $block_content );
+
+		// Check that the featured image block renders the image and has a sizes attribute.
+		$this->assertStringContainsString( 'wp-block-post-featured-image', $result );
+		$this->assertStringContainsString( $expected, $result );
+
+		wp_reset_postdata();
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array<array<string>> The image sizes.
+	 */
+	public static function data_post_featured_image_block_alignment(): array {
+		return array(
+			'Return contentSize 620px instead of image size 1080px, block default alignment'  => array(
+				'',
+				'sizes="(max-width: 620px) 100vw, 620px" ',
+			),
+			'Return wideSize 1280px instead of image size 1080px, block wide alignment'  => array(
+				'wide',
+				'sizes="(max-width: 1280px) 100vw, 1280px" ',
+			),
+			'Return full size instead of image size 1080px, block full alignment'  => array(
+				'full',
+				'sizes="100vw" ',
+			),
+			'Return image size 1080px, block left alignment'  => array(
+				'left',
+				'sizes="(max-width: 1080px) 100vw, 1080px" ',
+			),
+			'Return image size 1080px, block right alignment'  => array(
+				'right',
+				'sizes="(max-width: 1080px) 100vw, 1080px" ',
+			),
+			'Return contentSize 620px instead of image size 1080px, block center alignment'  => array(
+				'center',
+				'sizes="(max-width: 620px) 100vw, 620px" ',
+			),
+		);
+	}
+
 	/**
 	 * Filter the theme.json data to include relative layout sizes.
 	 *

plugins/view-transitions/includes/admin.php

@@ -3,7 +3,7 @@
  * Admin related functions for View Transitions.
  *
  * @package view-transitions
- * @since n.e.x.t
+ * @since 1.1.0
  */
 
 // @codeCoverageIgnoreStart
@@ -20,7 +20,7 @@
  * It should be hooked to an appropriate action to ensure the styles
  * are included in the page output.
  *
- * @since n.e.x.t
+ * @since 1.1.0
  */
 function plvt_print_view_transitions_admin_style(): void {
 	$options = plvt_get_stored_setting_value();