Merge branch 'trunk' into add/settings-section-id-anchors

Author: rakeshf

src/wp-includes/blocks.php

@@ -1196,6 +1196,7 @@ function apply_block_hooks_to_content( $content, $context = null, $callback = 'i
  * of the block that corresponds to the post type are handled correctly.
  *
  * @since 6.8.0
+ * @since 7.0.0 Added the `$ignored_hooked_blocks_at_root` parameter.
  * @access private
  *
  * @param string       $content  Serialized content.
@@ -1205,9 +1206,17 @@ function apply_block_hooks_to_content( $content, $context = null, $callback = 'i
  * @param callable     $callback A function that will be called for each block to generate
  *                               the markup for a given list of blocks that are hooked to it.
  *                               Default: 'insert_hooked_blocks'.
+ * @param array|null   $ignored_hooked_blocks_at_root A reference to an array that will be populated
+ *                               with the ignored hooked blocks at the root level.
+ *                               Default: `null`.
  * @return string The serialized markup.
  */
-function apply_block_hooks_to_content_from_post_object( $content, $post = null, $callback = 'insert_hooked_blocks' ) {
+function apply_block_hooks_to_content_from_post_object(
+	$content,
+	$post = null,
+	$callback = 'insert_hooked_blocks',
+	&$ignored_hooked_blocks_at_root = null
+) {
 	// Default to the current post if no context is provided.
 	if ( null === $post ) {
 		$post = get_post();
@@ -1287,6 +1296,16 @@ function apply_block_hooks_to_content_from_post_object( $content, $post = null,
 	$content = apply_block_hooks_to_content( $content, $post, $callback );
 	remove_filter( 'hooked_block_types', $suppress_blocks_from_insertion_before_and_after_wrapper_block, PHP_INT_MAX );
 
+	if ( null !== $ignored_hooked_blocks_at_root ) {
+		// Check wrapper block's metadata for ignored hooked blocks at the root level, and populate the reference parameter if needed.
+		$wrapper_block_markup = extract_serialized_parent_block( $content );
+		$wrapper_block        = parse_blocks( $wrapper_block_markup )[0];
+
+		if ( ! empty( $wrapper_block['attrs']['metadata']['ignoredHookedBlocks'] ) ) {
+			$ignored_hooked_blocks_at_root = $wrapper_block['attrs']['metadata']['ignoredHookedBlocks'];
+		}
+	}
+
 	// Finally, we need to remove the temporary wrapper block.
 	$content = remove_serialized_parent_block( $content );
 
@@ -1449,6 +1468,7 @@ function insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata( &$parsed_a
  *
  * @since 6.6.0
  * @since 6.8.0 Support non-`wp_navigation` post types.
+ * @since 7.0.0 Set `_wp_ignored_hooked_blocks` meta in the response for blocks hooked at the root level.
  *
  * @param WP_REST_Response $response The response object.
  * @param WP_Post          $post     Post object.
@@ -1459,12 +1479,18 @@ function insert_hooked_blocks_into_rest_response( $response, $post ) {
 		return $response;
 	}
 
+	$ignored_hooked_blocks_at_root    = array();
 	$response->data['content']['raw'] = apply_block_hooks_to_content_from_post_object(
 		$response->data['content']['raw'],
 		$post,
-		'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
+		'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+		$ignored_hooked_blocks_at_root
 	);
 
+	if ( ! empty( $ignored_hooked_blocks_at_root ) ) {
+		$response->data['meta']['_wp_ignored_hooked_blocks'] = wp_json_encode( $ignored_hooked_blocks_at_root );
+	}
+
 	// If the rendered content was previously empty, we leave it like that.
 	if ( empty( $response->data['content']['rendered'] ) ) {
 		return $response;

src/wp-includes/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php

@@ -215,6 +215,81 @@ private function normalize_schema_empty_object_defaults( array $schema ): array
 		return $schema;
 	}
 
+	/**
+	 * WordPress-internal schema keywords to strip from REST responses.
+	 *
+	 * @since 7.0.0
+	 * @var array<string, true>
+	 */
+	private const INTERNAL_SCHEMA_KEYWORDS = array(
+		'sanitize_callback' => true,
+		'validate_callback' => true,
+		'arg_options'       => true,
+	);
+
+	/**
+	 * Recursively removes WordPress-internal keywords from a schema.
+	 *
+	 * Ability schemas may include WordPress-internal properties like
+	 * `sanitize_callback`, `validate_callback`, and `arg_options` that are
+	 * used server-side but are not valid JSON Schema keywords. This method
+	 * removes those specific keys so they are not exposed in REST responses.
+	 *
+	 * @since 7.0.0
+	 *
+	 * @param array<string, mixed> $schema The schema array.
+	 * @return array<string, mixed> The schema without WordPress-internal keywords.
+	 */
+	private function strip_internal_schema_keywords( array $schema ): array {
+		$schema = array_diff_key( $schema, self::INTERNAL_SCHEMA_KEYWORDS );
+
+		// Sub-schema maps: keys are user-defined, values are sub-schemas.
+		// Note: 'dependencies' values can also be property-dependency arrays
+		// (numeric arrays of strings) which are skipped via wp_is_numeric_array().
+		foreach ( array( 'properties', 'patternProperties', 'definitions', 'dependencies' ) as $keyword ) {
+			if ( isset( $schema[ $keyword ] ) && is_array( $schema[ $keyword ] ) ) {
+				foreach ( $schema[ $keyword ] as $key => $child_schema ) {
+					if ( is_array( $child_schema ) && ! wp_is_numeric_array( $child_schema ) ) {
+						$schema[ $keyword ][ $key ] = $this->strip_internal_schema_keywords( $child_schema );
+					}
+				}
+			}
+		}
+
+		// Single sub-schema keywords.
+		foreach ( array( 'not', 'additionalProperties', 'additionalItems' ) as $keyword ) {
+			if ( isset( $schema[ $keyword ] ) && is_array( $schema[ $keyword ] ) ) {
+				$schema[ $keyword ] = $this->strip_internal_schema_keywords( $schema[ $keyword ] );
+			}
+		}
+
+		// Items: single schema or tuple array of schemas.
+		if ( isset( $schema['items'] ) ) {
+			if ( wp_is_numeric_array( $schema['items'] ) ) {
+				foreach ( $schema['items'] as $index => $item_schema ) {
+					if ( is_array( $item_schema ) ) {
+						$schema['items'][ $index ] = $this->strip_internal_schema_keywords( $item_schema );
+					}
+				}
+			} elseif ( is_array( $schema['items'] ) ) {
+				$schema['items'] = $this->strip_internal_schema_keywords( $schema['items'] );
+			}
+		}
+
+		// Array-of-schemas keywords.
+		foreach ( array( 'anyOf', 'oneOf', 'allOf' ) as $keyword ) {
+			if ( isset( $schema[ $keyword ] ) && is_array( $schema[ $keyword ] ) ) {
+				foreach ( $schema[ $keyword ] as $index => $sub_schema ) {
+					if ( is_array( $sub_schema ) ) {
+						$schema[ $keyword ][ $index ] = $this->strip_internal_schema_keywords( $sub_schema );
+					}
+				}
+			}
+		}
+
+		return $schema;
+	}
+
 	/**
 	 * Prepares an ability for response.
 	 *
@@ -230,8 +305,12 @@ public function prepare_item_for_response( $ability, $request ) {
 			'label'         => $ability->get_label(),
 			'description'   => $ability->get_description(),
 			'category'      => $ability->get_category(),
-			'input_schema'  => $this->normalize_schema_empty_object_defaults( $ability->get_input_schema() ),
-			'output_schema' => $this->normalize_schema_empty_object_defaults( $ability->get_output_schema() ),
+			'input_schema'  => $this->strip_internal_schema_keywords(
+				$this->normalize_schema_empty_object_defaults( $ability->get_input_schema() )
+			),
+			'output_schema' => $this->strip_internal_schema_keywords(
+				$this->normalize_schema_empty_object_defaults( $ability->get_output_schema() )
+			),
 			'meta'          => $ability->get_meta(),
 		);
 

tests/phpunit/tests/blocks/applyBlockHooksToContentFromPostObject.php

@@ -130,21 +130,59 @@ public function test_apply_block_hooks_to_content_from_post_object_inserts_hooke
 		$this->assertSame( $expected, $actual );
 	}
 
+	/**
+	 * @ticket 65008
+	 */
+	public function test_apply_block_hooks_to_content_from_post_object_sets_ignored_hooked_blocks() {
+		$ignored_hooked_blocks_at_root = array();
+
+		$expected = '<!-- wp:tests/hooked-block-first-child /-->' .
+			'<!-- wp:heading {"level":1,"metadata":{"ignoredHookedBlocks":["tests/hooked-block"]}} -->' .
+			'<h1>Hello World!</h1>' .
+			'<!-- /wp:heading -->' .
+			'<!-- wp:tests/hooked-block /-->';
+		$actual   = apply_block_hooks_to_content_from_post_object(
+			self::$post->post_content,
+			self::$post,
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
+		);
+		$this->assertSame( $expected, $actual, "Markup wasn't updated correctly." );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"Hooked block added at 'first_child' position wasn't added to ignoredHookedBlocks metadata."
+		);
+	}
+
 	/**
 	 * @ticket 62716
+	 * @ticket 65008
 	 */
 	public function test_apply_block_hooks_to_content_from_post_object_respects_ignored_hooked_blocks_post_meta() {
-		$expected = self::$post_with_ignored_hooked_block->post_content . '<!-- wp:tests/hooked-block /-->';
+		$ignored_hooked_blocks_at_root = array();
+
+		$expected = '<!-- wp:heading {"level":1,"metadata":{"ignoredHookedBlocks":["tests/hooked-block"]}} -->' .
+			'<h1>Hello World!</h1>' .
+			'<!-- /wp:heading -->' .
+			'<!-- wp:tests/hooked-block /-->';
 		$actual   = apply_block_hooks_to_content_from_post_object(
 			self::$post_with_ignored_hooked_block->post_content,
 			self::$post_with_ignored_hooked_block,
-			'insert_hooked_blocks'
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
 		);
 		$this->assertSame( $expected, $actual );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"Pre-existing ignored hooked block at root level wasn't reflected in metadata."
+		);
 	}
 
 	/**
 	 * @ticket 63287
+	 * @ticket 65008
 	 */
 	public function test_apply_block_hooks_to_content_from_post_object_does_not_insert_hooked_block_before_container_block() {
 		$filter = function ( $hooked_block_types, $relative_position, $anchor_block_type ) {
@@ -155,31 +193,50 @@ public function test_apply_block_hooks_to_content_from_post_object_does_not_inse
 			return $hooked_block_types;
 		};
 
+		$ignored_hooked_blocks_at_root = array();
+
 		$expected = '<!-- wp:tests/hooked-block-first-child /-->' .
-			self::$post->post_content .
+			'<!-- wp:heading {"level":1,"metadata":{"ignoredHookedBlocks":["tests/hooked-block"]}} -->' .
+			'<h1>Hello World!</h1>' .
+			'<!-- /wp:heading -->' .
 			'<!-- wp:tests/hooked-block /-->';
 
 		add_filter( 'hooked_block_types', $filter, 10, 3 );
 		$actual = apply_block_hooks_to_content_from_post_object(
 			self::$post->post_content,
 			self::$post,
-			'insert_hooked_blocks'
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
 		);
 		remove_filter( 'hooked_block_types', $filter, 10 );
 
-		$this->assertSame( $expected, $actual );
+		$this->assertSame( $expected, $actual, "Hooked block added before 'core/post-content' block shouldn't be inserted." );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"ignoredHookedBlocks metadata wasn't set correctly."
+		);
 	}
 
 	/**
 	 * @ticket 62716
+	 * @ticket 65008
 	 */
 	public function test_apply_block_hooks_to_content_from_post_object_inserts_hooked_block_if_content_contains_no_blocks() {
+		$ignored_hooked_blocks_at_root = array();
+
 		$expected = '<!-- wp:tests/hooked-block-first-child /-->' . self::$post_with_non_block_content->post_content;
 		$actual   = apply_block_hooks_to_content_from_post_object(
 			self::$post_with_non_block_content->post_content,
 			self::$post_with_non_block_content,
-			'insert_hooked_blocks'
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
+		);
+		$this->assertSame( $expected, $actual, "Markup wasn't updated correctly." );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"Hooked block added at 'first_child' position wasn't added to ignoredHookedBlocks metadata."
 		);
-		$this->assertSame( $expected, $actual );
 	}
 }

tests/phpunit/tests/multisite/isEmailAddressUnsafe.php

@@ -3,6 +3,8 @@
 /**
  * @group ms-required
  * @group multisite
+ *
+ * @covers ::is_email_address_unsafe
  */
 class Tests_Multisite_IsEmailAddressUnsafe extends WP_UnitTestCase {
 

tests/phpunit/tests/multisite/isUploadSpaceAvailable.php

@@ -8,6 +8,8 @@
  *
  * @group ms-required
  * @group multisite
+ *
+ * @covers ::is_upload_space_available
  */
 class Tests_Multisite_IsUploadSpaceAvailable extends WP_UnitTestCase {