Fix unit tests

Author: ellatrix

src/wp-includes/rest-api.php

@@ -298,16 +298,39 @@ function create_initial_rest_routes() {
 		}
 	}
 
-	// Register the old templates endpoints.
+	// Register the old templates endpoints. The WP_REST_Templates_Controller
+	// and sub-controllers used linked to the wp_template post type, but are no
+	// longer. They still require a post type object when contructing the class.
+	// To maintain backward and changes to these controller classes, we make use
+	// that the wp_template post type has the right information it needs.
 	$wp_post_types['wp_template']->rest_base = 'templates';
-	$controller                              = new WP_REST_Templates_Controller( 'wp_template' );
-	$wp_post_types['wp_template']->rest_controller = $controller;
-	$revisions_controller                    = new WP_REST_Template_Revisions_Controller( 'wp_template' );
+	// Store the classes so they can be restored.
+	$original_rest_controller_class           = $wp_post_types['wp_template']->rest_controller_class;
+	$original_autosave_rest_controller_class  = $wp_post_types['wp_template']->autosave_rest_controller_class;
+	$original_revisions_rest_controller_class = $wp_post_types['wp_template']->revisions_rest_controller_class;
+	// Temporarily set the old classes.
+	$wp_post_types['wp_template']->rest_controller_class           = 'WP_REST_Templates_Controller';
+	$wp_post_types['wp_template']->autosave_rest_controller_class  = 'WP_REST_Template_Autosaves_Controller';
+	$wp_post_types['wp_template']->revisions_rest_controller_class = 'WP_REST_Template_Revisions_Controller';
+	// Initialize the controllers. The order is important: the autosave
+	// controller needs both the templates and revisions controllers.
+	$controller                                              = new WP_REST_Templates_Controller( 'wp_template' );
+	$wp_post_types['wp_template']->rest_controller           = $controller;
+	$revisions_controller                                    = new WP_REST_Template_Revisions_Controller( 'wp_template' );
 	$wp_post_types['wp_template']->revisions_rest_controller = $revisions_controller;
-	$autosaves_controller                    = new WP_REST_Template_Autosaves_Controller( 'wp_template' );
-	$wp_post_types['wp_template']->rest_controller = null;
+	$autosaves_controller                                    = new WP_REST_Template_Autosaves_Controller( 'wp_template' );
+	// Unset the controller cache, it will be re-initialized when
+	// get_rest_controller is called.
+	$wp_post_types['wp_template']->rest_controller           = null;
 	$wp_post_types['wp_template']->revisions_rest_controller = null;
+	// Restore the original classes.
+	$wp_post_types['wp_template']->rest_controller_class = $original_rest_controller_class;
+	$wp_post_types['wp_template']->autosave_rest_controller_class = $original_autosave_rest_controller_class;
+	$wp_post_types['wp_template']->revisions_rest_controller_class = $original_revisions_rest_controller_class;
+	// Restore the original base.
 	$wp_post_types['wp_template']->rest_base = 'wp_template';
+
+	// Register the old routes.
 	$autosaves_controller->register_routes();
 	$revisions_controller->register_routes();
 	$controller->register_routes();

tests/phpunit/tests/rest-api/wpRestTemplateAutosavesController.php

@@ -589,7 +589,20 @@ public function test_prepare_item_with_data_provider( $parent_post_property_name
 		);
 		$autosave_db_post = get_post( $autosave_post_id );
 		$request          = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves/' . $autosave_db_post->ID );
+		// See create_initial_rest_routes. The controller need the post type
+		// with adjusted settings to initialize.
+		global $wp_post_types;
+		$wp_post_types['wp_template']->rest_base                       = 'templates';
+		$original_rest_controller_class                                = $wp_post_types['wp_template']->rest_controller_class;
+		$original_revisions_rest_controller_class                      = $wp_post_types['wp_template']->revisions_rest_controller_class;
+		$wp_post_types['wp_template']->rest_controller_class           = 'WP_REST_Templates_Controller';
+		$wp_post_types['wp_template']->revisions_rest_controller_class = 'WP_REST_Template_Revisions_Controller';
+		$wp_post_types['wp_template']->rest_controller                 = null;
+		$wp_post_types['wp_template']->revisions_rest_controller       = null;
 		$controller       = new WP_REST_Template_Autosaves_Controller( $parent_post->post_type );
+		$wp_post_types['wp_template']->rest_controller_class           = $original_rest_controller_class;
+		$wp_post_types['wp_template']->revisions_rest_controller_class = $original_revisions_rest_controller_class;
+		$wp_post_types['wp_template']->rest_base                       = 'wp_template';
 		$response         = $controller->prepare_item_for_response( $autosave_db_post, $request );
 		$this->assertInstanceOf(
 			WP_REST_Response::class,

tests/phpunit/tests/rest-api/wpRestTemplateRevisionsController.php

@@ -830,7 +830,16 @@ public function test_prepare_item_with_data_provider( $parent_post_property_name
 		$revision_id = array_shift( $revisions );
 		$post        = get_post( $revision_id );
 		$request     = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
+		// See create_initial_rest_routes. The controller need the post type
+		// with adjusted settings to initialize.
+		global $wp_post_types;
+		$wp_post_types['wp_template']->rest_base             = 'templates';
+		$original_rest_controller_class                      = $wp_post_types['wp_template']->rest_controller_class;
+		$wp_post_types['wp_template']->rest_controller_class = 'WP_REST_Templates_Controller';
+		$wp_post_types['wp_template']->rest_controller       = null;
 		$controller  = new WP_REST_Template_Revisions_Controller( $parent_post->post_type );
+		$wp_post_types['wp_template']->rest_controller_class = $original_rest_controller_class;
+		$wp_post_types['wp_template']->rest_base             = 'wp_template';
 		$response    = $controller->prepare_item_for_response( $post, $request );
 		$this->assertInstanceOf(
 			WP_REST_Response::class,