Change: Move delete_options to Options::class (#1694)

Co-authored-by: Konstantin Obenland <[email protected]>

Author: pfefferle

includes/class-activitypub.php

@@ -8,6 +8,7 @@
 namespace Activitypub;
 
 use Exception;
+use Activitypub\Options;
 use Activitypub\Collection\Actors;
 use Activitypub\Collection\Outbox;
 use Activitypub\Collection\Followers;
@@ -90,45 +91,7 @@ public static function uninstall() {
 		\remove_filter( 'pre_wp_update_comment_count_now', array( Comment::class, 'pre_wp_update_comment_count_now' ) );
 		Migration::update_comment_counts( 2000 );
 
-		\delete_option( 'activitypub_actor_mode' );
-		\delete_option( 'activitypub_allow_likes' );
-		\delete_option( 'activitypub_allow_replies' );
-		\delete_option( 'activitypub_attribution_domains' );
-		\delete_option( 'activitypub_authorized_fetch' );
-		\delete_option( 'activitypub_application_user_private_key' );
-		\delete_option( 'activitypub_application_user_public_key' );
-		\delete_option( 'activitypub_blog_user_also_known_as' );
-		\delete_option( 'activitypub_blog_user_mailer_new_dm' );
-		\delete_option( 'activitypub_blog_user_mailer_new_follower' );
-		\delete_option( 'activitypub_blog_user_mailer_new_mention' );
-		\delete_option( 'activitypub_blog_user_moved_to' );
-		\delete_option( 'activitypub_blog_user_private_key' );
-		\delete_option( 'activitypub_blog_user_public_key' );
-		\delete_option( 'activitypub_blog_description' );
-		\delete_option( 'activitypub_blog_identifier' );
-		\delete_option( 'activitypub_checklist_blocks_visited' );
-		\delete_option( 'activitypub_checklist_fediverse_intro_visited' );
-		\delete_option( 'activitypub_checklist_health_check_issues' );
-		\delete_option( 'activitypub_checklist_profile_setup_visited' );
-		\delete_option( 'activitypub_checklist_settings_visited' );
-		\delete_option( 'activitypub_content_negotiation' );
-		\delete_option( 'activitypub_custom_post_content' );
-		\delete_option( 'activitypub_db_version' );
-		\delete_option( 'activitypub_default_extra_fields' );
-		\delete_option( 'activitypub_enable_blog_user' );
-		\delete_option( 'activitypub_enable_users' );
-		\delete_option( 'activitypub_header_image' );
-		\delete_option( 'activitypub_last_post_with_permalink_as_id' );
-		\delete_option( 'activitypub_max_image_attachments' );
-		\delete_option( 'activitypub_migration_lock' );
-		\delete_option( 'activitypub_object_type' );
-		\delete_option( 'activitypub_outbox_purge_days' );
-		\delete_option( 'activitypub_shared_inbox' );
-		\delete_option( 'activitypub_support_post_types' );
-		\delete_option( 'activitypub_use_hashtags' );
-		\delete_option( 'activitypub_use_opengraph' );
-		\delete_option( 'activitypub_use_permalink_as_id_for_blog' );
-		\delete_option( 'activitypub_vary_header' );
+		Options::delete();
 	}
 
 	/**

includes/class-options.php

@@ -2,15 +2,13 @@
 /**
  * Options file.
  *
- * @package ActivityPub
+ * @package Activitypub
  */
 
-namespace ActivityPub;
+namespace Activitypub;
 
 /**
  * Options class.
- *
- * @package ActivityPub
  */
 class Options {
 
@@ -30,6 +28,15 @@ public static function init() {
 		\add_filter( 'option_activitypub_max_image_attachments', array( self::class, 'default_max_image_attachments' ) );
 	}
 
+	/**
+	 * Delete all options.
+	 */
+	public static function delete() {
+		global $wpdb;
+
+		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
+		$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE 'activitypub_%'" );
+	}
 
 	/**
 	 * Pre-get option filter for the Actor-Mode.

tests/includes/class-test-options.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Test file for Activitypub Options class.
+ *
+ * @package Activitypub
+ */
+
+namespace Activitypub\Tests;
+
+use Activitypub\Options;
+
+/**
+ * Test class for Activitypub Options.
+ */
+class Test_Options extends \WP_UnitTestCase {
+	/**
+	 * Test that delete() removes all options with the activitypub_ prefix.
+	 */
+	public function test_delete_removes_all_activitypub_options() {
+		\add_option( 'activitypub_test_option_1', 'value1' );
+		\add_option( 'activitypub_test_option_2', 'value2' );
+		\add_option( 'activitypub_test_option_3', 'value3' );
+		\add_option( 'no_activitypub_test_option', 'value4' );
+
+		$this->assertEquals( 'value1', \get_option( 'activitypub_test_option_1' ) );
+		$this->assertEquals( 'value2', \get_option( 'activitypub_test_option_2' ) );
+		$this->assertEquals( 'value3', \get_option( 'activitypub_test_option_3' ) );
+		$this->assertEquals( 'value4', \get_option( 'no_activitypub_test_option' ) );
+
+		Options::delete();
+
+		\wp_cache_flush();
+
+		$this->assertFalse( \get_option( 'activitypub_test_option_1', false ) );
+		$this->assertFalse( \get_option( 'activitypub_test_option_2', false ) );
+		$this->assertFalse( \get_option( 'activitypub_test_option_3', false ) );
+		$this->assertEquals( 'value4', \get_option( 'no_activitypub_test_option' ) );
+	}
+}