Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/blocks.php

@@ -2704,6 +2704,7 @@ function wp_migrate_old_typography_shape( $metadata ) {
  * @since 6.1.0 Added `query_loop_block_query_vars` filter and `parents` support in query.
  * @since 6.7.0 Added support for the `format` property in query.
  * @since 7.0.0 Updated `taxQuery` structure.
+ * @since 7.1.0 Added support for the `excludeCurrent` property in query.
  *
  * @param WP_Block $block Block instance.
  * @param int      $page  Current query's page.
@@ -2749,6 +2750,12 @@ function build_query_vars_from_query_block( $block, $page ) {
 			$excluded_post_ids     = array_filter( $excluded_post_ids );
 			$query['post__not_in'] = array_merge( $query['post__not_in'], $excluded_post_ids );
 		}
+		if ( ! empty( $block->context['query']['excludeCurrent'] ) ) {
+			$current_post_id = get_the_ID();
+			if ( $current_post_id ) {
+				$query['post__not_in'][] = $current_post_id;
+			}
+		}
 		if (
 			isset( $block->context['query']['perPage'] ) &&
 			is_numeric( $block->context['query']['perPage'] )

tests/phpunit/tests/blocks/wpBlock.php

@@ -12,10 +12,8 @@ class Tests_Blocks_wpBlock extends WP_UnitTestCase {
 
 	/**
 	 * Fake block type registry.
-	 *
-	 * @var WP_Block_Type_Registry|null
 	 */
-	private $registry = null;
+	private ?WP_Block_Type_Registry $registry = null;
 
 	/**
 	 * Set up each test method.
@@ -837,6 +835,36 @@ public function test_build_query_vars_from_query_block() {
 		);
 	}
 
+	/**
+	 * @ticket 65373
+	 */
+	public function test_build_query_vars_from_query_block_exclude_current(): void {
+		$this->registry->register(
+			'core/example',
+			array( 'uses_context' => array( 'query' ) )
+		);
+
+		global $post;
+		$post = self::factory()->post->create_and_get();
+		$this->assertInstanceOf( WP_Post::class, $post );
+
+		$parsed_blocks = parse_blocks( '<!-- wp:example {"ok":true} -->a<!-- wp:example /-->b<!-- /wp:example -->' );
+		$parsed_block  = $parsed_blocks[0];
+		$context       = array(
+			'query' => array(
+				'excludeCurrent' => true,
+			),
+		);
+		$block         = new WP_Block( $parsed_block, $context, $this->registry );
+		$query         = build_query_vars_from_query_block( $block, 1 );
+
+		$this->assertSame(
+			array( $post->ID ),
+			$query['post__not_in'],
+			'The current post ID should be excluded via post__not_in.'
+		);
+	}
+
 	/**
 	 * @ticket 64416
 	 */