Merge branch 'trunk' into fix/palette-pngs-to-avif-webp-conversion

Author: b1ink0

.github/workflows/php-test-plugins.yml

@@ -47,6 +47,8 @@ jobs:
             wp: '6.6'
           - php: '8.3'
             wp: 'trunk'
+          - php: '8.4'
+            wp: 'trunk'
           - php: '8.2'
             phpunit: '9.6'
             wp: 'latest'

package-lock.json

@@ -12,10 +12,10 @@
   },
   "devDependencies": {
     "@octokit/rest": "^22.0.0",
-    "@playwright/test": "^1.53.2",
+    "@playwright/test": "^1.54.1",
     "@types/node": "^24.0.10",
     "@wordpress/e2e-test-utils-playwright": "^1.26.0",
-    "@wordpress/env": "^10.26.0",
+    "@wordpress/env": "^10.27.0",
     "@wordpress/prettier-config": "^4.25.0",
     "@wordpress/scripts": "^30.19.0",
     "commander": "14.0.0",

package.json

@@ -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/hooks.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 );
+}