Applying fixes from #58607

lib/compat/wordpress-6.5/fonts/class-wp-rest-font-collections-controller.php

@@ -84,7 +84,7 @@ public function get_items( $request ) {
 			if ( $page > $max_pages && $total_items > 0 ) {
 				return new WP_Error(
 					'rest_post_invalid_page_number',
-					__( 'The page number requested is larger than the number of pages available.', 'default' ),
+					__( 'The page number requested is larger than the number of pages available.' ),
 					array( 'status' => 400 )
 				);
 			}
@@ -148,24 +148,18 @@ public function get_item( $request ) {
 				return $collection;
 			}
 
-			$item = $this->prepare_item_for_response( $collection, $request );
-
-			if ( is_wp_error( $item ) ) {
-				return $item;
-			}
-
-			return $item;
+			return $this->prepare_item_for_response( $collection, $request );
 		}
 
 		/**
-		 * Prepare a single collection output for response.
-		 *
-		 * @since 6.5.0
-		 *
-		 * @param WP_Font_Collection $collection Collection object.
-		 * @param WP_REST_Request    $request    Request object.
-		 * @return array|WP_Error
-		 */
+		* Prepare a single collection output for response.
+		*
+		* @since 6.5.0
+		*
+		* @param WP_Font_Collection $collection Collection object.
+		* @param WP_REST_Request    $request    Request object.
+		* @return WP_REST_Response Response object.
+		*/
 		public function prepare_item_for_response( $collection, $request ) {
 			$fields = $this->get_fields_for_response( $request );
 			$item   = array();
@@ -195,9 +189,9 @@ public function prepare_item_for_response( $collection, $request ) {
 			 *
 			 * @since 6.5.0
 			 *
-			 * @param WP_REST_Response $response The response object.
+			 * @param WP_REST_Response   $response    The response object.
 			 * @param WP_Font_Collection $collection  The Font Collection object.
-			 * @param WP_REST_Request  $request  Request used to generate the response.
+			 * @param WP_REST_Request    $request     Request used to generate the response.
 			 */
 			return apply_filters( 'rest_prepare_font_collection', $response, $collection, $request );
 		}
@@ -262,15 +256,14 @@ public function get_item_schema() {
 		 * @return array Links for the given font collection.
 		 */
 		protected function prepare_links( $collection ) {
-			$links = array(
+			return array(
 				'self'       => array(
 					'href' => rest_url( sprintf( '%s/%s/%s', $this->namespace, $this->rest_base, $collection->slug ) ),
 				),
 				'collection' => array(
 					'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
 				),
 			);
-			return $links;
 		}
 
 		/**

lib/compat/wordpress-6.5/fonts/class-wp-rest-font-faces-controller.php

@@ -151,7 +151,7 @@ public function get_item_permissions_check( $request ) {
 		 *
 		 * @param string          $value   Encoded JSON string of font face settings.
 		 * @param WP_REST_Request $request Request object.
-		 * @return false|WP_Error True if the settings are valid, otherwise a WP_Error object.
+		 * @return true|WP_Error True if the settings are valid, otherwise a WP_Error object.
 		 */
 		public function validate_create_font_face_settings( $value, $request ) {
 			$settings = json_decode( $value, true );
@@ -698,7 +698,7 @@ protected function get_parent_font_family_post( $font_family_id ) {
 		 */
 		protected function prepare_links( $post ) {
 			// Entity meta.
-			$links = array(
+			return array(
 				'self'       => array(
 					'href' => rest_url( $this->namespace . '/font-families/' . $post->post_parent . '/font-faces/' . $post->ID ),
 				),
@@ -709,8 +709,6 @@ protected function prepare_links( $post ) {
 					'href' => rest_url( $this->namespace . '/font-families/' . $post->post_parent ),
 				),
 			);
-
-			return $links;
 		}
 
 		/**
@@ -788,7 +786,7 @@ public function handle_font_file_upload_error( $file, $message ) {
 			$status = 500;
 			$code   = 'rest_font_upload_unknown_error';
 
-			if ( __( 'Sorry, you are not allowed to upload this file type.', 'default' ) === $message ) {
+			if ( __( 'Sorry, you are not allowed to upload this file type.' ) === $message ) {
 				$status = 400;
 				$code   = 'rest_font_upload_invalid_file_type';
 			}
@@ -799,7 +797,7 @@ public function handle_font_file_upload_error( $file, $message ) {
 		/**
 		* Returns relative path to an uploaded font file.
 		*
-		* The path is relative to the current fonts dir.
+		* The path is relative to the current fonts directory.
 		*
 		* @since 6.5.0
 		* @access private