Connectors: Remove wp_register_connector() wrapper in favor of direct registry usage.

Plugins now use $registry->register() directly in the wp_connectors_init
action callback, which structurally enforces correct registration timing
without needing a doing_action() guard.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: gziolo

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

@@ -40,12 +40,8 @@ final class WP_Connector_Registry {
 	/**
 	 * Registers a new connector.
 	 *
-	 * Do not use this method directly. Instead, use the `wp_register_connector()` function.
-	 *
 	 * @since 7.0.0
 	 *
-	 * @see wp_register_connector()
-	 *
 	 * @param string $id   The unique connector identifier. Must contain only lowercase
 	 *                     alphanumeric characters and underscores.
 	 * @param array  $args {

src/wp-includes/connectors.php

@@ -10,76 +10,6 @@
 use WordPress\AiClient\AiClient;
 use WordPress\AiClient\Providers\Http\DTO\ApiKeyRequestAuthentication;
 
-/**
- * Registers a new connector.
- *
- * Must be called during the `wp_connectors_init` action.
- *
- * Example:
- *
- *     function my_plugin_register_connectors(): void {
- *         wp_register_connector(
- *             'my_custom_ai',
- *             array(
- *                 'name'           => __( 'My Custom AI', 'my-plugin' ),
- *                 'description'    => __( 'Custom AI provider integration.', 'my-plugin' ),
- *                 'type'           => 'ai_provider',
- *                 'authentication' => array(
- *                     'method'          => 'api_key',
- *                     'credentials_url' => 'https://example.com/api-keys',
- *                 ),
- *             )
- *         );
- *     }
- *     add_action( 'wp_connectors_init', 'my_plugin_register_connectors' );
- *
- * @since 7.0.0
- *
- * @see WP_Connector_Registry::register()
- *
- * @param string $id   The unique connector identifier. Must contain only lowercase
- *                     alphanumeric characters and underscores.
- * @param array  $args {
- *     An associative array of arguments for the connector.
- *
- *     @type string $name           Required. The connector's display name.
- *     @type string $description    Optional. The connector's description. Default empty string.
- *     @type string $type           Required. The connector type. Currently, only 'ai_provider' is supported.
- *     @type array  $authentication {
- *         Required. Authentication configuration.
- *
- *         @type string      $method          Required. The authentication method: 'api_key' or 'none'.
- *         @type string|null $credentials_url Optional. URL where users can obtain API credentials.
- *     }
- *     @type array  $plugin         Optional. Plugin data for install/activate UI.
- *         @type string $slug       The WordPress.org plugin slug.
- *     }
- * }
- * @return array|null The registered connector data on success, null on failure.
- */
-function wp_register_connector( string $id, array $args ): ?array {
-	if ( ! doing_action( 'wp_connectors_init' ) ) {
-		_doing_it_wrong(
-			__FUNCTION__,
-			sprintf(
-				/* translators: 1: wp_connectors_init, 2: string value of the connector ID. */
-				__( 'Connectors must be registered on the %1$s action. The connector %2$s was not registered.' ),
-				'<code>wp_connectors_init</code>',
-				'<code>' . esc_html( $id ) . '</code>'
-			),
-			'7.0.0'
-		);
-		return null;
-	}
-
-	$registry = WP_Connector_Registry::get_instance();
-	if ( null === $registry ) {
-		return null;
-	}
-
-	return $registry->register( $id, $args );
-}
-
 /**
  * Checks if a connector is registered.
  *
@@ -244,7 +174,24 @@ function _wp_connectors_init(): void {
 	 * Fires when the connector registry is ready for plugins to register connectors.
 	 *
 	 * Default connectors have already been registered at this point and cannot be
-	 * unhooked. Use `wp_register_connector()` within this action to add new connectors.
+	 * unhooked. Use `$registry->register()` within this action to add new connectors.
+	 *
+	 * Example usage:
+	 *
+	 *     add_action( 'wp_connectors_init', function ( WP_Connector_Registry $registry ) {
+	 *         $registry->register(
+	 *             'my_custom_ai',
+	 *             array(
+	 *                 'name'           => __( 'My Custom AI', 'my-plugin' ),
+	 *                 'description'    => __( 'Custom AI provider integration.', 'my-plugin' ),
+	 *                 'type'           => 'ai_provider',
+	 *                 'authentication' => array(
+	 *                     'method'          => 'api_key',
+	 *                     'credentials_url' => 'https://example.com/api-keys',
+	 *                 ),
+	 *             )
+	 *         );
+	 *     } );
 	 *
 	 * @since 7.0.0
 	 *

tests/phpunit/tests/connectors/wpRegisterConnector.php

@@ -1,78 +1,14 @@
 <?php
 /**
- * Tests for wp_register_connector() and companion functions.
+ * Tests for connector registration companion functions.
  *
  * @group connectors
- * @covers ::wp_register_connector
  * @covers ::wp_is_connector_registered
  * @covers ::wp_get_connector
  * @covers ::wp_get_connectors
  */
 class Tests_Connectors_WpRegisterConnector extends WP_UnitTestCase {
 
-	/**
-	 * Default valid connector args for testing.
-	 *
-	 * @var array
-	 */
-	private static $default_args = array();
-
-	/**
-	 * Set up before class.
-	 */
-	public static function set_up_before_class() {
-		parent::set_up_before_class();
-
-		self::$default_args = array(
-			'name'           => 'Test Connector',
-			'description'    => 'A test connector.',
-			'type'           => 'ai_provider',
-			'authentication' => array(
-				'method'          => 'api_key',
-				'credentials_url' => 'https://example.com/keys',
-			),
-		);
-	}
-
-	/**
-	 * Helper to simulate the wp_connectors_init action for registration.
-	 *
-	 * @param callable $callback The registration callback to run.
-	 */
-	private function simulate_doing_wp_connectors_init_action( callable $callback ): void {
-		global $wp_current_filter;
-		$wp_current_filter[] = 'wp_connectors_init';
-		$callback();
-		array_pop( $wp_current_filter );
-	}
-
-	/**
-	 * @ticket 64791
-	 */
-	public function test_register_fails_outside_action() {
-		$this->setExpectedIncorrectUsage( 'wp_register_connector' );
-
-		$result = wp_register_connector( 'outside_action', self::$default_args );
-
-		$this->assertNull( $result );
-	}
-
-	/**
-	 * @ticket 64791
-	 */
-	public function test_register_succeeds_during_action() {
-		$result = null;
-
-		$this->simulate_doing_wp_connectors_init_action(
-			function () use ( &$result ) {
-				$result = wp_register_connector( 'during_action', self::$default_args );
-			}
-		);
-
-		$this->assertIsArray( $result );
-		$this->assertSame( 'Test Connector', $result['name'] );
-	}
-
 	/**
 	 * @ticket 64791
 	 */