Reapply changeset 54184.

After rebasing on top of trunk, the PR reverted some
of the changes in wp-includes/block-template-utils.php
that were added in changest 54184.

This commit reapplies the code from that changeset.

It also cleans up in one test.

src/wp-includes/block-template-utils.php

@@ -552,8 +552,8 @@ function _build_block_template_result_from_post( $post ) {
 	}
 
 	$theme          = $terms[0]->name;
-	$has_theme_file = wp_get_theme()->get_stylesheet() === $theme &&
-		null !== _get_block_template_file( $post->post_type, $post->post_name );
+	$template_file  = _get_block_template_file( $post->post_type, $post->post_name );
+	$has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
 
 	$origin           = get_post_meta( $post->ID, 'origin', true );
 	$is_wp_suggestion = get_post_meta( $post->ID, 'is_wp_suggestion', true );
@@ -680,6 +680,14 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
 			continue;
 		}
 
+		if (
+			$post_type &&
+			isset( $template->post_types ) &&
+			! in_array( $post_type, $template->post_types, true )
+		) {
+			continue;
+		}
+
 		$query_result[] = $template;
 	}
 

tests/phpunit/tests/block-templates/base.php

@@ -76,6 +76,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 
 	public static function wpTearDownAfterClass() {
 		wp_delete_post( self::$template_post->ID );
+		wp_delete_post( self::$template_part_post->ID );
 	}
 
 	public function set_up() {