Miscellaneous type fixes

Author: chriszarate

src/wp-includes/collaboration/class-wp-http-polling-sync-server.php

@@ -190,11 +190,7 @@ public function check_permissions( WP_REST_Request $request ) {
 
 			$entity_kind = $type_parts[0];
 			$entity_name = $object_parts[0];
-			$object_id   = null;
-
-			if ( isset( $object_parts[1] ) ) {
-				$object_id = $object_parts[1];
-			}
+			$object_id   = $object_parts[1] ?? null;
 
 			if ( ! $this->can_user_sync_entity_type( $entity_kind, $entity_name, $object_id ) ) {
 				return new WP_Error(
@@ -428,7 +424,7 @@ private function get_time_marker(): int {
 	 * @param int    $client_id    Client identifier.
 	 * @param int    $cursor       Return updates after this cursor.
 	 * @param bool   $is_compactor True if this client is nominated to perform compaction.
-	 * @return array Response data for this room.
+	 * @return array<string, mixed> Response data for this room.
 	 */
 	private function get_updates_after( string $room, int $client_id, int $cursor, bool $is_compactor ): array {
 		$end_cursor    = $this->get_time_marker() - 100; // Small buffer to ensure consistency.

src/wp-includes/collaboration/class-wp-sync-post-meta-storage.php

@@ -30,7 +30,7 @@ class WP_Sync_Post_Meta_Storage implements WP_Sync_Storage {
 	 * @since 6.8.0
 	 * @var int|null
 	 */
-	private static $storage_post_id = null;
+	private static ?int $storage_post_id = null;
 
 	/**
 	 * Initializer.
@@ -152,9 +152,9 @@ private function get_room_meta_key( string $room ): string {
 	 *
 	 * @since 6.8.0
 	 *
-	 * @return int Post ID.
+	 * @return int|null Post ID.
 	 */
-	private function get_storage_post_id(): int {
+	private function get_storage_post_id(): ?int {
 		if ( is_int( self::$storage_post_id ) ) {
 			return self::$storage_post_id;
 		}
@@ -165,13 +165,14 @@ private function get_storage_post_id(): int {
 				'post_type'      => self::POST_TYPE,
 				'posts_per_page' => 1,
 				'post_status'    => 'publish',
-				'orderby'        => 'ID',
+				'fields'         => 'ids',
 				'order'          => 'ASC',
 			)
 		);
 
-		if ( ! empty( $posts ) ) {
-			self::$storage_post_id = $posts[0]->ID;
+		$post_id = array_first( $posts );
+		if ( is_int( $post_id ) ) {
+			self::$storage_post_id = $post_id;
 			return self::$storage_post_id;
 		}
 
@@ -184,7 +185,7 @@ private function get_storage_post_id(): int {
 			)
 		);
 
-		if ( ! is_wp_error( $post_id ) ) {
+		if ( is_int( $post_id ) ) {
 			self::$storage_post_id = $post_id;
 		}