Update to using new async_batch approach

Author: obenland

includes/class-migration.php

@@ -137,7 +137,7 @@ public static function maybe_migrate() {
 			self::migrate_from_0_16();
 		}
 		if ( \version_compare( $version_from_db, '1.0.0', '<' ) ) {
-			\wp_schedule_single_event( \time(), 'activitypub_async_batch', array( array( self::class, 'migrate_from_0_17' ) ) );
+			\wp_schedule_single_event( \time(), 'activitypub_migrate_from_0_17' );
 		}
 		if ( \version_compare( $version_from_db, '1.3.0', '<' ) ) {
 			self::migrate_from_1_2_0();
@@ -158,7 +158,7 @@ public static function maybe_migrate() {
 			self::migrate_to_4_1_0();
 		}
 		if ( \version_compare( $version_from_db, '4.5.0', '<' ) ) {
-			\wp_schedule_single_event( \time() + MINUTE_IN_SECONDS, 'activitypub_async_batch', array( array( self::class, 'update_comment_counts' ) ) );
+			\wp_schedule_single_event( \time() + MINUTE_IN_SECONDS, 'activitypub_update_comment_counts' );
 		}
 		if ( \version_compare( $version_from_db, '4.7.1', '<' ) ) {
 			self::migrate_to_4_7_1();
@@ -171,8 +171,8 @@ public static function maybe_migrate() {
 		}
 		if ( \version_compare( $version_from_db, '5.0.0', '<' ) ) {
 			Scheduler::register_schedules();
-			\wp_schedule_single_event( \time(), 'activitypub_async_batch', array( array( self::class, 'create_post_outbox_items' ) ) );
-			\wp_schedule_single_event( \time() + 15, 'activitypub_async_batch', array( array( self::class, 'create_comment_outbox_items' ) ) );
+			\wp_schedule_single_event( \time(), 'activitypub_create_post_outbox_items' );
+			\wp_schedule_single_event( \time() + 15, 'activitypub_create_comment_outbox_items' );
 			add_action( 'init', 'flush_rewrite_rules', 20 );
 		}
 		if ( \version_compare( $version_from_db, '5.2.0', '<' ) ) {

includes/class-scheduler.php

@@ -37,8 +37,12 @@ public static function init() {
 		self::register_schedulers();
 
 		self::$batch_callbacks = array(
-			'activitypub_send_activity'  => array( Dispatcher::class, 'send_to_followers' ),
-			'activitypub_retry_activity' => array( Dispatcher::class, 'retry_send_to_followers' ),
+			'activitypub_send_activity'               => array( Dispatcher::class, 'send_to_followers' ),
+			'activitypub_retry_activity'              => array( Dispatcher::class, 'retry_send_to_followers' ),
+			'activitypub_migrate_from_0_17'           => array( Migration::class, 'migrate_from_0_17' ),
+			'activitypub_update_comment_counts'       => array( Migration::class, 'update_comment_counts' ),
+			'activitypub_create_post_outbox_items'    => array( Migration::class, 'create_post_outbox_items' ),
+			'activitypub_create_comment_outbox_items' => array( Migration::class, 'create_comment_outbox_items' ),
 		);
 
 		// Follower Cleanups.
@@ -49,6 +53,10 @@ public static function init() {
 		\add_action( 'activitypub_async_batch', array( self::class, 'async_batch' ), 10, 99 );
 		\add_action( 'activitypub_send_activity', array( self::class, 'async_batch' ), 10, 3 );
 		\add_action( 'activitypub_retry_activity', array( self::class, 'async_batch' ), 10, 3 );
+		\add_action( 'activitypub_migrate_from_0_17', array( self::class, 'async_batch' ) );
+		\add_action( 'activitypub_update_comment_counts', array( self::class, 'async_batch' ), 10, 2 );
+		\add_action( 'activitypub_create_post_outbox_items', array( self::class, 'async_batch' ), 10, 2 );
+		\add_action( 'activitypub_create_comment_outbox_items', array( self::class, 'async_batch' ), 10, 2 );
 		\add_action( 'activitypub_reprocess_outbox', array( self::class, 'reprocess_outbox' ) );
 		\add_action( 'activitypub_outbox_purge', array( self::class, 'purge_outbox' ) );
 
@@ -326,7 +334,7 @@ public static function async_batch() {
 			return;
 		}
 
-		$key = \md5( \serialize( $args[0] ?? $args ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
+		$key = \md5( \serialize( $callback ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
 
 		// Bail if the existing lock is still valid.
 		if ( self::is_locked( $key ) ) {

tests/includes/class-test-migration.php

@@ -177,8 +177,7 @@ public function test_migration_scheduling() {
 
 		Migration::maybe_migrate();
 
-		$schedule = \wp_next_scheduled( 'activitypub_migrate', array( '0.0.1' ) );
-		$this->assertNotFalse( $schedule );
+		$this->assertNotFalse( \wp_next_scheduled( 'activitypub_migrate_from_0_17' ) );
 
 		// Clean up.
 		delete_option( 'activitypub_db_version' );

tests/includes/class-test-scheduler.php

@@ -361,15 +361,15 @@ public function test_update_comment_counts_with_existing_valid_lock() {
 		// Set a lock.
 		Scheduler::lock( $key );
 
-		Scheduler::async_batch( $callback, 10, 0 );
+		\do_action( 'activitypub_update_comment_counts', 10, 0 );
 
 		// Verify a scheduled event was created.
-		$next_scheduled = wp_next_scheduled( 'activitypub_async_batch', array( $callback, 10, 0 ) );
+		$next_scheduled = wp_next_scheduled( 'activitypub_update_comment_counts', array( 10, 0 ) );
 		$this->assertNotFalse( $next_scheduled );
 
 		// Clean up.
 		delete_option( 'activitypub_migration_lock' );
-		wp_clear_scheduled_hook( 'activitypub_async_batch', array( $callback, 10, 0 ) );
+		wp_clear_scheduled_hook( 'activitypub_update_comment_counts', array( 10, 0 ) );
 	}
 
 	/**
@@ -385,8 +385,10 @@ public function test_async_upgrade() {
 
 		// Test that lock prevents simultaneous upgrades.
 		Scheduler::lock( $key );
-		Scheduler::async_batch( $callback );
-		$scheduled = \wp_next_scheduled( 'activitypub_async_batch', array( $callback ) );
+
+		\do_action( 'activitypub_create_post_outbox_items', 10, 0 );
+
+		$scheduled = \wp_next_scheduled( 'activitypub_create_post_outbox_items', array( 10, 0 ) );
 		$this->assertNotFalse( $scheduled );
 		Scheduler::unlock( $key );
 
@@ -395,15 +397,18 @@ public function test_async_upgrade() {
 		\add_action( 'transition_post_status', array( \Activitypub\Scheduler\Post::class, 'schedule_post_activity' ), 33, 3 );
 
 		// Test scheduling next batch when callback returns more work.
-		Scheduler::async_batch( $callback, 1, 0 ); // Small batch size to force multiple batches.
-		$scheduled = \wp_next_scheduled( 'activitypub_async_batch', array( $callback, 1, 1 ) );
+		\do_action( 'activitypub_create_post_outbox_items', 1, 0 ); // Small batch size to force multiple batches.
+		$scheduled = \wp_next_scheduled( 'activitypub_create_post_outbox_items', array( 1, 1 ) );
 		$this->assertNotFalse( $scheduled );
 
 		// Test no scheduling when callback returns null (no more work).
-		Scheduler::async_batch( $callback, 100, 1000 ); // Large offset to ensure no posts found.
+		\do_action( 'activitypub_create_post_outbox_items', 100, 1000 ); // Large offset to ensure no posts found.
 		$this->assertFalse(
-			\wp_next_scheduled( 'activitypub_async_batch', array( $callback, 100, 1100 ) )
+			\wp_next_scheduled( 'activitypub_create_post_outbox_items', array( 100, 1100 ) )
 		);
+	}
+
+	/**
 	 * Test async_batch method.
 	 *
 	 * @covers ::async_batch