REST API: Always call rest_get_server() instead of accessing the $wp_rest_server global.

This is a consistency improvement and also a bug fix for fairly obscure cases involving modified WP load order.

Fixes #41555.


git-svn-id: https://develop.svn.wordpress.org/trunk@41238 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
James Nylen
2017-08-10 01:37:30 +00:00
parent d339af1bc1
commit d570de32ca
2 changed files with 26 additions and 13 deletions

View File

@@ -16,7 +16,12 @@ class Tests_REST_API extends WP_UnitTestCase {
public function setUp() {
// Override the normal server with our spying server.
$GLOBALS['wp_rest_server'] = new Spy_REST_Server();
parent::setup();
parent::setUp();
}
public function tearDown() {
remove_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
parent::tearDown();
}
/**
@@ -446,4 +451,21 @@ class Tests_REST_API extends WP_UnitTestCase {
public function test_rest_parse_date_force_utc( $string, $value ) {
$this->assertEquals( $value, rest_parse_date( $string, true ) );
}
public function filter_wp_rest_server_class( $class_name ) {
return 'Spy_REST_Server';
}
public function test_register_rest_route_without_server() {
$GLOBALS['wp_rest_server'] = null;
add_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
register_rest_route( 'test-ns', '/test', array(
'methods' => array( 'GET' ),
'callback' => '__return_null',
) );
$routes = $GLOBALS['wp_rest_server']->get_routes();
$this->assertEquals( $routes['/test-ns/test'][0]['methods'], array( 'GET' => true ) );
}
}