Use template hierarchy instead of hooking into pre_get_block_template

plugins/woocommerce/src/Blocks/Templates/AbstractTemplateWithFallback.php

@@ -22,84 +22,9 @@ abstract class AbstractTemplateWithFallback extends AbstractTemplate {
 	 * Initialization method.
 	 */
 	public function init() {
-		// Make it searching for a template returns the default WooCommerce template.
-		add_filter( 'pre_get_block_template', array( $this, 'get_block_template_fallback' ), 10, 3 );
 		add_filter( 'taxonomy_template_hierarchy', array( $this, 'template_hierarchy' ), 1 );
 	}
 
-	/**
-	 * This function is used on the `pre_get_block_template` hook to return the fallback template from the db in case
-	 * the template is eligible for it.
-	 *
-	 * @param \WP_Block_Template|null $template Block template object to short-circuit the default query,
-	 *                                          or null to allow WP to run its normal queries.
-	 * @param string                  $id Template unique identifier (example: theme_slug//template_slug).
-	 * @param string                  $template_type wp_template or wp_template_part.
-	 *
-	 * @return object|null
-	 */
-	public function get_block_template_fallback( $template, $id, $template_type ) {
-		// Add protection against invalid ids.
-		if ( ! is_string( $id ) || ! strstr( $id, '//' ) ) {
-			return null;
-		}
-		// Add protection against invalid template types.
-		if (
-			'wp_template' !== $template_type &&
-			'wp_template_part' !== $template_type
-		) {
-			return null;
-		}
-		$template_name_parts = explode( '//', $id );
-		$theme               = $template_name_parts[0] ?? '';
-		$slug                = $template_name_parts[1] ?? '';
-
-		if ( empty( $theme ) || empty( $slug ) || ! BlockTemplateUtils::template_is_eligible_for_product_archive_fallback( $slug ) ) {
-			return null;
-		}
-		if ( BlockTemplateUtils::theme_has_template( self::SLUG ) ) {
-			return null;
-		}
-
-		$wp_query_args  = array(
-			'post_name__in' => array( $this->fallback_template, $slug ),
-			'post_type'     => $template_type,
-			'post_status'   => array( 'auto-draft', 'draft', 'publish', 'trash' ),
-			'no_found_rows' => true,
-			'tax_query'     => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
-				array(
-					'taxonomy' => 'wp_theme',
-					'field'    => 'name',
-					'terms'    => $theme,
-				),
-			),
-		);
-		$template_query = new \WP_Query( $wp_query_args );
-		$posts          = $template_query->posts;
-
-		// If we have more than one result from the query, it means that the current template is present in the db (has
-		// been customized by the user) and we should not return the `archive-product` template.
-		if ( count( $posts ) > 1 ) {
-			return null;
-		}
-
-		if ( count( $posts ) > 0 && $this->fallback_template === $posts[0]->post_name ) {
-			$template = _build_block_template_result_from_post( $posts[0] );
-
-			if ( ! is_wp_error( $template ) ) {
-				$template->id          = $theme . '//' . $slug;
-				$template->slug        = $slug;
-				$template->title       = BlockTemplateUtils::get_block_template_title( $slug );
-				$template->description = BlockTemplateUtils::get_block_template_description( $slug );
-				unset( $template->source );
-
-				return $template;
-			}
-		}
-
-		return $template;
-	}
-
 	/**
 	 * When the page should be displaying the template, add it to the hierarchy.
 	 *
@@ -110,7 +35,7 @@ public function get_block_template_fallback( $template, $id, $template_type ) {
 	 * @param array $templates Templates that match the pages_template_hierarchy.
 	 */
 	public function template_hierarchy( $templates ) {
-		$index = array_search( static::SLUG, $templates );
+		$index = array_search( static::SLUG, $templates ) || array_search( static::SLUG . '.php', $templates );
 		if (
 			false !== $index && (
 				! array_key_exists( $index + 1, $templates ) || $templates[ $index + 1 ] !== $this->fallback_template