Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-64108-errors-emitted-during-output-buffer-callback

Author: westonruter

src/wp-includes/rest-api/class-wp-rest-response.php

@@ -76,9 +76,9 @@ public function add_link( $rel, $href, $attributes = array() ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param string $rel  Link relation. Either an IANA registered type, or an absolute URL.
-	 * @param string $href Optional. Only remove links for the relation matching the given href.
-	 *                     Default null.
+	 * @param string      $rel  Link relation. Either an IANA registered type, or an absolute URL.
+	 * @param string|null $href Optional. Only remove links for the relation matching the given href.
+	 *                          Default null.
 	 */
 	public function remove_link( $rel, $href = null ) {
 		if ( ! isset( $this->links[ $rel ] ) ) {

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -224,9 +224,9 @@ protected function error_to_response( $error ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param string $code    WP_Error-style code.
-	 * @param string $message Human-readable message.
-	 * @param int    $status  Optional. HTTP status code to send. Default null.
+	 * @param string   $code    WP_Error-style code.
+	 * @param string   $message Human-readable message.
+	 * @param int|null $status  Optional. HTTP status code to send. Default null.
 	 * @return string JSON representation of the error
 	 */
 	protected function json_error( $code, $message, $status = null ) {
@@ -278,8 +278,8 @@ protected function get_json_encode_options( WP_REST_Request $request ) {
 	 *
 	 * @global WP_User $current_user The currently authenticated user.
 	 *
-	 * @param string $path Optional. The request route. If not set, `$_SERVER['PATH_INFO']` will be used.
-	 *                     Default null.
+	 * @param string|null $path Optional. The request route. If not set, `$_SERVER['PATH_INFO']` will be used.
+	 *                          Default null.
 	 * @return null|false Null if not served and a HEAD request, false otherwise.
 	 */
 	public function serve_request( $path = null ) {
@@ -655,12 +655,11 @@ public static function get_response_links( $response ) {
 	}
 
 	/**
-	 * Gets the target links for a REST API Link.
+	 * Gets the target hints for a REST API Link.
 	 *
 	 * @since 6.7.0
 	 *
-	 * @param array $link
-	 *
+	 * @param array $link The link to get target hints for.
 	 * @return array|null
 	 */
 	protected static function get_target_hints_for_link( $link ) {
@@ -764,6 +763,7 @@ public static function get_compact_response_links( $response ) {
 	 *
 	 * @param array         $data  Data from the request.
 	 * @param bool|string[] $embed Whether to embed all links or a filtered list of link relations.
+	 *                             Default true.
 	 * @return array {
 	 *     Data with sub-requests embedded.
 	 *