sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REST API: Ensure rest_controller instantiates the post type's declared REST controller class.

Browse Source 
Ensures that the ::get_rest_controller() method will always return an instanceof the expected controller class, or null.
Removes unused private static property $post_type_controllers.

Props dlh, TimothyBlynJacobs.
Fixes #45677.



git-svn-id: https://develop.svn.wordpress.org/trunk@46435 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
K. Adam White 2019-10-08 13:41:29 +00:00
parent 040304def7
commit e2cf94fa04
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/class-wp-post-type.php
View File

@ -343,7 +343,7 @@ final class WP_Post_Type {
* @since 5.3.0
* @var WP_REST_Controller $rest_controller
*/
private $rest_controller;
public $rest_controller;
/**
* Constructor.
@ -722,6 +722,10 @@ final class WP_Post_Type {
$this->rest_controller = new $class( $this->name );
}
if ( ! ( $this->rest_controller instanceof $class ) ) {
return null;
}
return $this->rest_controller;
}
}

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

@ -15,15 +15,6 @@
* @see WP_REST_Controller
*/
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.
*

31
tests/phpunit/tests/rest-api/rest-posts-controller.php
View File

@ -4617,6 +4617,37 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te
);
}
/**
* @ticket 45677
*/
public function test_get_for_post_type_returns_null_for_invalid_provided_controller() {
register_post_type(
'test',
array(
'show_in_rest' => true,
'rest_controller' => new \stdClass(),
)
);
$this->assertNull( get_post_type_object( 'test' )->get_rest_controller() );
}
/**
* @ticket 45677
*/
public function test_get_for_post_type_returns_null_for_controller_class_mismatch() {
register_post_type(
'test',
array(
'show_in_rest' => true,
'rest_controller_class' => WP_REST_Posts_Controller::class,
'rest_controller' => new WP_REST_Terms_Controller( 'category' ),
)
);
$this->assertNull( get_post_type_object( 'test' )->get_rest_controller() );
}
public function tearDown() {
_unregister_post_type( 'private-post' );
_unregister_post_type( 'youseeme' );