Merge branch 'trunk' into add/reader

Author: pfefferle

includes/class-migration.php

@@ -655,6 +655,7 @@ public static function update_comment_author_emails( $batch_size = 50, $offset =
 			array(
 				'number'     => $batch_size,
 				'offset'     => $offset,
+				'orderby'    => 'comment_ID',
 				// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
 				'meta_query' => array(
 					array(

tests/phpunit/tests/includes/class-test-migration.php

@@ -120,6 +120,8 @@ public function tear_down() {
 		foreach ( $outbox_items as $item_id ) {
 			\wp_delete_post( $item_id, true );
 		}
+
+		parent::tear_down();
 	}
 
 	/**
@@ -594,20 +596,16 @@ public function test_update_comment_author_emails() {
 	 */
 	public function test_update_comment_author_emails_batching() {
 		// Create multiple comments.
-		$comment_ids = array();
-		for ( $i = 0; $i < 3; $i++ ) {
-			$comment_ids[] = self::factory()->comment->create(
-				array(
-					'comment_post_ID'      => self::$fixtures['posts'][0],
-					'comment_author'       => "Test User $i",
-					'comment_author_url'   => "https://example.com/users/test$i",
-					'comment_author_email' => '',
-					'comment_content'      => "Test comment $i",
-					'comment_type'         => 'comment',
-					'comment_meta'         => array( 'protocol' => 'activitypub' ),
-				)
-			);
-		}
+		// Note: We rely on comment_ID ordering (added to migration function) for deterministic batching.
+		$comment_ids = self::factory()->comment->create_many(
+			3,
+			array(
+				'comment_post_ID'      => self::$fixtures['posts'][0],
+				'comment_author_email' => '',
+				'comment_type'         => 'comment',
+				'comment_meta'         => array( 'protocol' => 'activitypub' ),
+			)
+		);
 
 		// Mock the HTTP request.
 		\add_filter( 'pre_http_request', array( $this, 'mock_webfinger' ) );
@@ -630,11 +628,8 @@ public function test_update_comment_author_emails_batching() {
 		foreach ( $comment_ids as $comment_id ) {
 			$comment = \get_comment( $comment_id );
 			$this->assertEquals( '[email protected]', $comment->comment_author_email );
-
-			wp_delete_comment( $comment_id, true );
 		}
 
-		_delete_all_data();
 		\remove_filter( 'pre_http_request', array( $this, 'mock_webfinger' ) );
 	}