Address Copilot review feedback

- Hook init to plugins_loaded action for proper timing
- Add is_admin() check before registering admin hooks
- Call init() in activate() to ensure integrations are loaded
- Update activate() docblock to better describe its purpose
- Add proper test cleanup for global variables
- Clarify changelog wording about deprecated filter

Author: pfefferle

README.md

@@ -84,7 +84,7 @@ Project and support maintained on github at [pfefferle/wordpress-nodeinfo](https
 ### 3.1.0
 
 * Added singleton-based plugin loading mechanism for better extensibility
-* Deprecated `wellknown_nodeinfo_data` filter in favor of `nodeinfo_discovery`
+* Added backwards compatibility handler for deprecated `wellknown_nodeinfo_data` filter
 
 ### 3.0.0
 

includes/class-nodeinfo.php

@@ -65,7 +65,10 @@ public function init() {
 
 		$this->register_integrations();
 		$this->register_hooks();
-		$this->register_admin_hooks();
+
+		if ( \is_admin() ) {
+			$this->register_admin_hooks();
+		}
 
 		$this->initialized = true;
 	}
@@ -152,12 +155,14 @@ public function add_rewrite_rules() {
 	}
 
 	/**
-	 * Flush rewrite rules.
+	 * Handle plugin activation.
 	 *
-	 * Should be called on plugin activation.
+	 * Initializes the plugin and flushes rewrite rules.
 	 */
 	public static function activate() {
-		self::get_instance()->add_rewrite_rules();
+		$instance = self::get_instance();
+		$instance->init();
+		$instance->add_rewrite_rules();
 		\flush_rewrite_rules();
 	}
 

nodeinfo.php

@@ -39,8 +39,13 @@ function nodeinfo_plugin() {
 	return Nodeinfo\Nodeinfo::get_instance();
 }
 
-// Initialize the plugin.
-nodeinfo_plugin()->init();
+// Initialize the plugin after all plugins are loaded.
+add_action(
+	'plugins_loaded',
+	function () {
+		nodeinfo_plugin()->init();
+	}
+);
 
 // Register activation and deactivation hooks.
 register_activation_hook( __FILE__, array( Nodeinfo\Nodeinfo::class, 'activate' ) );

tests/phpunit/tests/class-test-nodeinfo.php

@@ -45,6 +45,9 @@ public function test_get_instance_returns_nodeinfo() {
 	public function test_rest_routes_registered() {
 		global $wp_rest_server;
 
+		// Save original state.
+		$original_server = $wp_rest_server;
+
 		$wp_rest_server = new \WP_REST_Server();
 		do_action( 'rest_api_init' );
 
@@ -53,7 +56,8 @@ public function test_rest_routes_registered() {
 		$this->assertArrayHasKey( '/nodeinfo/discovery', $routes );
 		$this->assertArrayHasKey( '/nodeinfo2/(?P<version>\\d\\.\\d)', $routes );
 
-		$wp_rest_server = null;
+		// Restore original state.
+		$wp_rest_server = $original_server;
 	}
 
 	/**
@@ -79,6 +83,9 @@ public function test_integrations_register_versions() {
 	public function test_rewrite_rules_added() {
 		global $wp_rewrite;
 
+		// Save original permalink structure.
+		$original_structure = $wp_rewrite->permalink_structure;
+
 		// Enable permalinks for testing.
 		$wp_rewrite->set_permalink_structure( '/%postname%/' );
 
@@ -93,8 +100,9 @@ public function test_rewrite_rules_added() {
 		$this->assertArrayHasKey( '^.well-known/nodeinfo', $rules );
 		$this->assertArrayHasKey( '^.well-known/x-nodeinfo2', $rules );
 
-		// Reset permalink structure.
-		$wp_rewrite->set_permalink_structure( '' );
+		// Restore original permalink structure.
+		$wp_rewrite->set_permalink_structure( $original_structure );
+		$wp_rewrite->flush_rules();
 	}
 
 	/**
@@ -135,11 +143,14 @@ public function test_webfinger_filter_registered() {
 	}
 
 	/**
-	 * Test admin hooks are registered.
+	 * Test admin hooks can be registered.
 	 *
 	 * @covers ::register_admin_hooks
 	 */
 	public function test_admin_hooks_registered() {
-		$this->assertTrue( has_action( 'admin_init' ) !== false );
+		// Call register_admin_hooks directly to test it works.
+		\Nodeinfo\Nodeinfo::get_instance()->register_admin_hooks();
+
+		$this->assertNotFalse( has_action( 'admin_init' ) );
 	}
 }