Merge branch 'trunk' into inconsistency

Mdsujansarkar · web-flow · commit d45e2a352b4f · 2025-11-03T11:11:31.000+06:00
diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -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 ) {

Original file line number	Diff line number	Diff line change
`@@ -278,8 +278,8 @@ protected function get_json_encode_options( WP_REST_Request $request ) {`
`278`	`278`	`*`
`279`	`279`	`* @global WP_User $current_user The currently authenticated user.`
`280`	`280`	`*`
`281`		- * @param string $path Optional. The request route. If not set, `$_SERVER['PATH_INFO']` will be used.
`282`		`- * Default null.`
	`281`	+ * @param string\|null $path Optional. The request route. If not set, `$_SERVER['PATH_INFO']` will be used.
	`282`	`+ * Default null.`
`283`	`283`	`* @return null\|false Null if not served and a HEAD request, false otherwise.`
`284`	`284`	`*/`
`285`	`285`	`public function serve_request( $path = null ) {`