Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part.

lib/compat/wordpress-6.3/class-gutenberg-rest-templates-controller-6-3.php

@@ -65,4 +65,65 @@ public function get_template_fallback( $request ) {
 		$response = $this->prepare_item_for_response( $fallback_template, $request );
 		return rest_ensure_response( $response );
 	}
+
+	/**
+	 * Add revisions to the response.
+	 *
+	 * @param WP_Block_Template $item    Template instance.
+	 * @param WP_REST_Request   $request Request object.
+	 * @return WP_REST_Response Response object.
+	 */
+	public function prepare_item_for_response( $item, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		$template = $item;
+
+		$fields = $this->get_fields_for_response( $request );
+
+		$response = parent::prepare_item_for_response( $item, $request );
+
+		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
+			$links = $this->prepare_revision_links( $template );
+			$response->add_links( $links );
+			if ( ! empty( $links['self']['href'] ) ) {
+				$actions = $this->get_available_actions();
+				$self    = $links['self']['href'];
+				foreach ( $actions as $rel ) {
+					$response->add_link( $rel, $self );
+				}
+			}
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Adds revisions to links.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_Block_Template $template  Template instance.
+	 * @return array Links for the given post.
+	 */
+	protected function prepare_revision_links( $template ) {
+		$links = array();
+
+		if ( post_type_supports( $this->post_type, 'revisions' ) && (int) $template->wp_id ) {
+			$revisions       = wp_get_latest_revision_id_and_total_count( (int) $template->wp_id );
+			$revisions_count = ! is_wp_error( $revisions ) ? $revisions['count'] : 0;
+			$revisions_base  = sprintf( '/%s/%s/%s/revisions', $this->namespace, $this->rest_base, $template->id );
+
+			$links['version-history'] = array(
+				'href'  => rest_url( $revisions_base ),
+				'count' => $revisions_count,
+			);
+
+			if ( $revisions_count > 0 ) {
+				$links['predecessor-version'] = array(
+					'href' => rest_url( $revisions_base . '/' . $revisions['latest_id'] ),
+					'id'   => $revisions['latest_id'],
+				);
+			}
+		}
+
+		return $links;
+	}
 }

lib/experimental/rest-api.php

@@ -29,27 +29,6 @@ function gutenberg_register_block_editor_settings() {
 add_action( 'rest_api_init', 'gutenberg_register_block_editor_settings' );
 
 
-/**
- * Hook in to the template and template part post types and decorate
- * the rest endpoint with the revision count.
- *
- * When merging to core, this can be removed once Gutenberg_REST_Template_Revision_Count is
- * merged with WP_REST_Template_Controller.
- *
- * @param array  $args Current registered post type args.
- * @param string $post_type Name of post type.
- *
- * @return array
- */
-function wp_api_template_revision_args( $args, $post_type ) {
-	if ( 'wp_template' === $post_type || 'wp_template_part' === $post_type ) {
-		$args['rest_controller_class'] = 'Gutenberg_REST_Template_Revision_Count';
-	}
-
-	return $args;
-}
-add_filter( 'register_post_type_args', 'wp_api_template_revision_args', 10, 2 );
-
 /**
  * Shim for get_sample_permalink() to add support for auto-draft status.
  *

lib/load.php

@@ -57,7 +57,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	if ( ! class_exists( 'WP_Rest_Customizer_Nonces' ) ) {
 		require_once __DIR__ . '/experimental/class-wp-rest-customizer-nonces.php';
 	}
-	require_once __DIR__ . '/experimental/class-gutenberg-rest-template-revision-count.php';
 
 	require_once __DIR__ . '/experimental/rest-api.php';
 }

phpunit/class-gutenberg-rest-templates-controller-test.php

@@ -59,7 +59,7 @@ public function test_get_template_fallback() {
 		$request->set_param( 'is_custom', false );
 		$request->set_param( 'template_prefix', 'tag' );
 		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 'tag', $response->get_data()['slug'], 'Should fallback to `index.html`.' );
+		$this->assertSame( 'index', $response->get_data()['slug'], 'Should fallback to `index.html`.' );
 	}
 
 	public function test_context_param() {