Connector Registry: Add default is_active callback and enhance tests for plugin registration

Author: Adi-ty

src/wp-includes/class-wp-connector-registry.php

@@ -114,6 +114,7 @@ final class WP_Connector_Registry {
 	 *                                   directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
 	 *         @type callable $is_active Optional callback to determine whether the plugin
 	 *                                   is active. Receives no arguments and must return bool.
+	 *                                   Defaults to `__return_true`.
 	 *     }
 	 * }
 	 * @return array|null The registered connector data on success, null on failure.
@@ -261,6 +262,8 @@ public function register( string $id, array $args ): ?array {
 				}
 
 				$connector['plugin']['is_active'] = $args['plugin']['is_active'];
+			} else {
+				$connector['plugin']['is_active'] = '__return_true';
 			}
 		}
 

src/wp-includes/connectors.php

@@ -638,10 +638,6 @@ function _wp_connectors_pass_default_keys_to_ai_client(): void {
 function _wp_connectors_get_connector_script_module_data( array $data ): array {
 	$registry = AiClient::defaultRegistry();
 
-	if ( ! function_exists( 'is_plugin_active' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/plugin.php';
-	}
-
 	$connectors = array();
 	foreach ( wp_get_connectors() as $connector_id => $connector_data ) {
 		$auth     = $connector_data['authentication'];
@@ -674,17 +670,7 @@ function _wp_connectors_get_connector_script_module_data( array $data ): array {
 
 		if ( ! empty( $connector_data['plugin']['file'] ) ) {
 			$file         = $connector_data['plugin']['file'];
-			$is_installed = false;
-			$is_activated = false;
-
-			if ( ! empty( $connector_data['plugin']['is_active'] ) && is_callable( $connector_data['plugin']['is_active'] ) ) {
-				$is_activated = (bool) call_user_func( $connector_data['plugin']['is_active'] );
-			}
-
-			if ( ! $is_activated ) {
-				$is_activated = is_plugin_active( $file );
-			}
-
+			$is_activated = (bool) call_user_func( $connector_data['plugin']['is_active'] );
 			$is_installed = $is_activated || file_exists( WP_PLUGIN_DIR . '/' . $file );
 
 			$connector_out['plugin'] = array(

tests/phpunit/tests/connectors/wpConnectorRegistry.php

@@ -299,7 +299,55 @@ public function test_register_includes_plugin_data() {
 		$result = $this->registry->register( 'with-plugin', $args );
 
 		$this->assertArrayHasKey( 'plugin', $result );
-		$this->assertSame( array( 'file' => 'my-plugin/my-plugin.php' ), $result['plugin'] );
+		$this->assertSame( 'my-plugin/my-plugin.php', $result['plugin']['file'] );
+	}
+
+	/**
+	 * @ticket 65020
+	 */
+	public function test_register_stores_plugin_is_active_callback() {
+		$args           = self::$default_args;
+		$args['plugin'] = array(
+			'file'      => 'my-plugin/my-plugin.php',
+			'is_active' => '__return_true',
+		);
+
+		$result = $this->registry->register( 'with-callback', $args );
+
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'is_active', $result['plugin'] );
+		$this->assertIsCallable( $result['plugin']['is_active'] );
+	}
+
+	/**
+	 * @ticket 65020
+	 */
+	public function test_register_rejects_non_callable_plugin_is_active() {
+		$this->setExpectedIncorrectUsage( 'WP_Connector_Registry::register' );
+
+		$args           = self::$default_args;
+		$args['plugin'] = array(
+			'file'      => 'my-plugin/my-plugin.php',
+			'is_active' => 'not_a_real_function_name',
+		);
+
+		$result = $this->registry->register( 'bad-callback', $args );
+
+		$this->assertNull( $result );
+	}
+
+	/**
+	 * @ticket 65020
+	 */
+	public function test_register_defaults_plugin_is_active_to_return_true() {
+		$args           = self::$default_args;
+		$args['plugin'] = array( 'file' => 'my-plugin/my-plugin.php' );
+
+		$result = $this->registry->register( 'default-callback', $args );
+
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'is_active', $result['plugin'] );
+		$this->assertSame( '__return_true', $result['plugin']['is_active'] );
 	}
 
 	/**