Context Navigation

Back to Ticket #35329

Ticket #35329: 35329.4.diff

File 35329.4.diff, 4.0 KB (added by danielbachhuber, 10 years ago)
Use corrected @since tags

src/wp-includes/rest-api.php

diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index 0b2da7f..d4c0aca 100644

                function rest_api_loaded() {
          */
         define( 'REST_REQUEST', true );
+        /** @var WP_REST_Server $wp_rest_server */
+        global $wp_rest_server;
+        /**
+         * Filter the REST Server Class.
+         *
+         * This filter allows you to adjust the server class used by the API, using a
+         * different class to handle requests.
+         *
+         * @since 4.4.0
+         *
+         * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
+         */
+        $wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
+        $wp_rest_server = new $wp_rest_server_class;
+        /**
+         * Fires when preparing to serve an API request.
+         *
+         * Endpoint objects should be created and register their hooks on this action rather
+         * than another action to ensure they're only loaded when needed.
+         *
+         * @since 4.4.0
+         *
+         * @param WP_REST_Server $wp_rest_server Server object.
+         */
+        do_action( 'rest_api_init', $wp_rest_server );
+        // Initialize the server.
+        $server = rest_get_server();
         // Fire off the request.
         $wp_rest_server->serve_request( $GLOBALS['wp']->query_vars['rest_route'] );
+        $server->serve_request( $GLOBALS['wp']->query_vars['rest_route'] );
         // We're done.
         die();
-…
+               function rest_url( $path = '', $scheme = 'json' ) {
  * @return WP_REST_Response REST response.
  */
 function rest_do_request( $request ) {
-        global $wp_rest_server;
         $request = rest_ensure_request( $request );
+        return $wp_rest_server->dispatch( $request );
+        return rest_get_server()->dispatch( $request );
+}
+/**
+ * Get the current REST server instance.
+ *
+ * Instantiates a new instance if none exists already.
+ *
+ * @since 4.5.0
+ *
+ * @global WP_REST_Server $wp_rest_server REST server instance.
+ *
+ * @return  WP_REST_Server REST server instance.
+ */
+function rest_get_server() {
+        /* @var WP_REST_Server $wp_rest_server */
+        global $wp_rest_server;
+        if ( empty( $wp_rest_server ) ) {
+                /**
+                 * Filter the REST Server Class.
+                 *
+                 * This filter allows you to adjust the server class used by the API, using a
+                 * different class to handle requests.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
+                 */
+                $wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
+                $wp_rest_server = new $wp_rest_server_class;
+                /**
+                 * Fires when preparing to serve an API request.
+                 *
+                 * Endpoint objects should be created and register their hooks on this action rather
+                 * than another action to ensure they're only loaded when needed.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param WP_REST_Server $wp_rest_server Server object.
+                 */
+                do_action( 'rest_api_init', $wp_rest_server );
+        }
+        return $wp_rest_server;
+}
 /**

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

diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php
index 33e3f24..0c148c2 100644

a	b	class Tests_REST_Server extends WP_Test_REST_TestCase {
15	15
16	16	/** @var WP_REST_Server $wp_rest_server */
17	17	global $wp_rest_server;
18		~~$this->server = $wp_rest_server = new Spy_REST_Server();~~
19	18
20		do_action( 'rest_api_init', $this->server );
	19	unset( $wp_rest_server );
	20	add_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
	21	$this->server = rest_get_server();
	22	remove_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
21	23	}
22	24
23	25	public function test_envelope() {
…	…	class Tests_REST_Server extends WP_Test_REST_TestCase {
645	647	$this->assertFalse( isset( $headers[ $header ] ) && $headers[ $header ] === $value, sprintf( 'Header %s is set to nocache.', $header ) );
646	648	}
647	649	}
	650
	651	public function filter_wp_rest_server_class() {
	652	return 'Spy_REST_Server';
	653	}
648	654	}

Download in other formats:

Original Format

Make WordPress Core

Context Navigation

Ticket #35329: 35329.4.diff

src/wp-includes/rest-api.php

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

Download in other formats: