Ticket #45677: 45677.6.diff

src/wp-includes/rest-api.php

@@ -191 +191 @@
  * @since 4.7.0
  */
 function create_initial_rest_routes() {
-        foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
-                $class = ! empty( $post_type->rest_controller_class ) ? $post_type->rest_controller_class : 'WP_REST_Posts_Controller';
+        foreach ( get_post_types( array( 'show_in_rest' => true ) ) as $post_type ) {
+                $controller = WP_REST_Posts_Controller::get_for_post_type( $post_type );
 
-                if ( ! class_exists( $class ) ) {
-                        continue;
-                }
-                $controller = new $class( $post_type->name );
-                if ( ! is_subclass_of( $controller, 'WP_REST_Controller' ) ) {
+                if ( ! $controller ) {
                         continue;
                 }
 
                 $controller->register_routes();
 
-                if ( post_type_supports( $post_type->name, 'revisions' ) ) {
-                        $revisions_controller = new WP_REST_Revisions_Controller( $post_type->name );
+                if ( post_type_supports( $post_type, 'revisions' ) ) {
+                        $revisions_controller = new WP_REST_Revisions_Controller( $post_type );
                         $revisions_controller->register_routes();
                 }
 
-                if ( 'attachment' !== $post_type->name ) {
-                        $autosaves_controller = new WP_REST_Autosaves_Controller( $post_type->name );
+                if ( 'attachment' !== $post_type ) {
+                        $autosaves_controller = new WP_REST_Autosaves_Controller( $post_type );
                         $autosaves_controller->register_routes();
                 }
         }

src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php

@@ -57 +57 @@
          * @param string $parent_post_type Post type of the parent.
          */
         public function __construct( $parent_post_type ) {
-                $this->parent_post_type = $parent_post_type;
-                $post_type_object       = get_post_type_object( $parent_post_type );
+                $parent_controller = WP_REST_Posts_Controller::get_for_post_type( $parent_post_type );
 
-                // Ensure that post type-specific controller logic is available.
-                $parent_controller_class = ! empty( $post_type_object->rest_controller_class ) ? $post_type_object->rest_controller_class : 'WP_REST_Posts_Controller';
+                if ( ! $parent_controller ) {
+                        $parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
+                }
 
-                $this->parent_controller    = new $parent_controller_class( $post_type_object->name );
+                $this->parent_post_type     = $parent_post_type;
+                $post_type_object           = get_post_type_object( $parent_post_type );
+                $this->parent_controller    = $parent_controller;
                 $this->revisions_controller = new WP_REST_Revisions_Controller( $parent_post_type );
                 $this->rest_namespace       = 'wp/v2';
                 $this->rest_base            = 'autosaves';

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -1582 +1582 @@
          * @return bool Whether post can be read.
          */
         protected function check_read_post_permission( $post, $request ) {
-                $posts_controller = new WP_REST_Posts_Controller( $post->post_type );
-                $post_type        = get_post_type_object( $post->post_type );
+                $posts_controller = WP_REST_Posts_Controller::get_for_post_type( $post->post_type );
+
+                if ( ! $posts_controller instanceof WP_REST_Posts_Controller ) {
+                        $posts_controller = new WP_REST_Posts_Controller( $post->post_type );
+                }
+
+                $post_type = get_post_type_object( $post->post_type );
 
                 $has_password_filter = false;
 

src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -16 +16 @@
  */
 class WP_REST_Posts_Controller extends WP_REST_Controller {
 
+        /**
+         * Instances of post type controllers keyed by post type.
+         *
+         * @since 5.3.0
+         * @var WP_REST_Controller[]
+         */
+        private static $post_type_controllers = array();
+
         /**
          * Post type.
          *
@@ -48 +56 @@
                 $this->meta = new WP_REST_Post_Meta_Fields( $this->post_type );
         }
 
+        /**
+         * Gets the REST API controller for a post type.
+         *
+         * @since 5.3.0
+         *
+         * @param string $post_type
+         * @return WP_REST_Controller|null The controller instance, or null if the specified is invalid or the post type
+         *                                 is set not to show in rest.
+         */
+        public static function get_for_post_type( $post_type ) {
+                if ( array_key_exists( $post_type, self::$post_type_controllers ) ) {
+                        return self::$post_type_controllers[ $post_type ];
+                }
+
+                $definition = get_post_type_object( $post_type );
+
+                if ( ! $definition ) {
+                        self::$post_type_controllers[ $post_type ] = null;
+
+                        return self::$post_type_controllers[ $post_type ];
+                }
+
+                $class = $definition->rest_controller_class ? $definition->rest_controller_class : WP_REST_Posts_Controller::class;
+
+                if ( ! class_exists( $class ) ) {
+                        self::$post_type_controllers[ $post_type ] = null;
+
+                        return self::$post_type_controllers[ $post_type ];
+                }
+
+                if ( ! is_subclass_of( $class, WP_REST_Controller::class ) ) {
+                        self::$post_type_controllers[ $post_type ] = null;
+
+                        return self::$post_type_controllers[ $post_type ];
+                }
+
+                self::$post_type_controllers[ $post_type ] = new $class( $post_type );
+
+                return self::$post_type_controllers[ $post_type ];
+        }
+
         /**
          * Registers the routes for the objects of the controller.
          *

src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php

@@ -48 +48 @@
          * @param string $parent_post_type Post type of the parent.
          */
         public function __construct( $parent_post_type ) {
+                $parent_controller = WP_REST_Posts_Controller::get_for_post_type( $parent_post_type );
+
+                if ( ! $parent_controller ) {
+                        $parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
+                }
+
                 $this->parent_post_type  = $parent_post_type;
-                $this->parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
+                $this->parent_controller = $parent_controller;
                 $this->namespace         = 'wp/v2';
                 $this->rest_base         = 'revisions';
                 $post_type_object        = get_post_type_object( $parent_post_type );

tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -3011 +3011 @@
                 $wp_rest_additional_fields = array();
         }
 
+        /**
+         * @ticket 45677
+         */
+        public function test_comments_controller_uses_registered_post_type_controller_to_check_read_post_permission() {
+                register_post_type(
+                        'test',
+                        array(
+                                'show_in_rest' => true,
+                        )
+                );
+
+                $mock = $this->getMockBuilder( WP_REST_Posts_Controller::class )
+                                        ->setMethods( array( 'check_read_permission' ) )
+                                        ->setConstructorArgs( array( 'test' ) )
+                                        ->getMock();
+                $mock->expects( $this->once() )->method( 'check_read_permission' )->willReturn( false );
+
+                get_post_type_object( 'test' )->rest_controller_class = get_class( $mock );
+
+                $reflect = new ReflectionProperty( WP_REST_Posts_Controller::class, 'post_type_controllers' );
+                $reflect->setAccessible( true );
+                $reflect->setValue(
+                        array(
+                                'test' => $mock,
+                        )
+                );
+
+                $post_id    = self::factory()->post->create(
+                        array(
+                                'post_type' => 'test',
+                        )
+                );
+                $comment_id = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID' => $post_id,
+                                'user_id'         => self::$subscriber_id,
+                        )
+                );
+
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', $comment_id ) );
+                $response = rest_get_server()->dispatch( $request );
+
+                $this->assertErrorResponse( 'rest_cannot_read', $response );
+        }
+
         public function additional_field_get_callback( $object ) {
                 return get_comment_meta( $object['id'], 'my_custom_int', true );
         }

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -4277 +4277 @@
 
         }
 
+        /**
+         * @ticket 45677
+         */
+        public function test_get_for_post_type_reuses_same_instance() {
+                $this->assertSame(
+                        WP_REST_Posts_Controller::get_for_post_type( 'post' ),
+                        WP_REST_Posts_Controller::get_for_post_type( 'post' )
+                );
+        }
+
+        /**
+         * @ticket 45677
+         */
+        public function test_get_for_post_type_returns_null_for_non_existent_post_type() {
+                $this->assertNull( WP_REST_Posts_Controller::get_for_post_type( 'doesnotexist' ) );
+        }
+
+        /**
+         * @ticket 45677
+         */
+        public function test_get_for_post_type_returns_null_if_class_does_not_exist() {
+                register_post_type(
+                        'class_not_found',
+                        array(
+                                'show_in_rest'          => true,
+                                'rest_controller_class' => 'Class_That_Does_Not_Exist',
+                        )
+                );
+
+                $this->assertNull( WP_REST_Posts_Controller::get_for_post_type( 'class_not_found' ) );
+        }
+
+        /**
+         * @ticket 45677
+         */
+        public function test_get_for_post_type_returns_null_if_class_does_not_subclass_rest_controller() {
+                register_post_type(
+                        'invalid_class',
+                        array(
+                                'show_in_rest'          => true,
+                                'rest_controller_class' => 'WP_Post',
+                        ),
+                );
+
+                $this->assertNull( WP_REST_Posts_Controller::get_for_post_type( 'invalid_class' ) );
+        }
+
+        /**
+         * @ticket 45677
+         */
+        public function test_get_for_post_type_returns_posts_controller_if_custom_class_not_specified() {
+                register_post_type(
+                        'test',
+                        array(
+                                'show_in_rest' => true,
+                        )
+                );
+
+                $this->assertInstanceOf(
+                        WP_REST_Posts_Controller::class,
+                        WP_REST_Posts_Controller::get_for_post_type( 'test' )
+                );
+        }
+
+        /**
+         * @ticket 45677
+         */
+        public function test_get_for_post_type_returns_provided_controller_class() {
+                $this->assertInstanceOf(
+                        WP_REST_Blocks_Controller::class,
+                        WP_REST_Posts_Controller::get_for_post_type( 'wp_block' )
+                );
+        }
+
         public function tearDown() {
                 _unregister_post_type( 'private-post' );
                 _unregister_post_type( 'youseeme' );