-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Connectors: Add connectors registry for extensibility #11175
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
132f672
Connectors: Add `wp_connectors_settings` filter for extensibility.
gziolo ea5fe48
Connectors: Improve `wp_connectors_settings` filter PHPDoc and test c…
gziolo e5ca2b3
Connectors: Add registry guards before registering settings and passi…
gziolo ccafc8d
Connectors: Move `wp_connectors_settings` filter after `setting_name`…
gziolo 0a93a5f
Connectors: Add test for filter returning empty array.
gziolo c0736e5
Connectors: Replace filter with WP_Connector_Registry and action-base…
gziolo b733ffc
Connectors: Preserve AI Client registry data precedence over hardcode…
gziolo f07ab82
Apply suggestions from code review
gziolo 45571c3
Update src/wp-includes/connectors.php
gziolo b5c0289
Connectors: Address review feedback for registry extensibility.
gziolo 064ef5e
Apply suggestions from code review
gziolo 0286b11
Update src/wp-includes/class-wp-connector-registry.php
gziolo 1850024
Connectors: Remove wp_register_connector() wrapper in favor of direct…
gziolo 7f91d3b
Connectors: Add timing guard to WP_Connector_Registry::set_instance().
gziolo 96e934d
Connectors: Add setting_name to PHPStan Connector type.
gziolo 5b9603c
Connectors: Fix indentation in catch block.
gziolo 96e2ff6
Connectors: Format PHPStan Connector type as multi-line.
gziolo 0362b35
Connectors: Restrict set_instance() to only work during the init action.
gziolo 9989675
Connectors: Add logo_url support to the connector registry.
gziolo 1f8e9a8
Tests: Add tests for _wp_connectors_resolve_ai_provider_logo_url().
gziolo 408d5c4
Connectors: Add method_exists() check for getLogoPath().
gziolo 5abc91e
Connectors: Remove method_exists() check for getLogoPath().
gziolo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,289 @@ | ||
| <?php | ||
| /** | ||
| * Connectors API | ||
| * | ||
| * Defines WP_Connector_Registry class. | ||
| * | ||
| * @package WordPress | ||
| * @subpackage Connectors | ||
| * @since 7.0.0 | ||
| */ | ||
|
|
||
| /** | ||
| * Manages the registration and lookup of connectors. | ||
| * | ||
| * @since 7.0.0 | ||
| * @access private | ||
| * | ||
| * @phpstan-type Connector array{ | ||
| * name: string, | ||
| * description: string, | ||
| * logo_url?: string|null, | ||
| * type: string, | ||
| * authentication: array{ | ||
| * method: string, | ||
| * credentials_url?: string|null, | ||
| * setting_name?: string | ||
| * }, | ||
| * plugin?: array{ | ||
| * slug: string | ||
| * } | ||
| * } | ||
| */ | ||
| final class WP_Connector_Registry { | ||
| /** | ||
| * The singleton instance of the registry. | ||
| * | ||
| * @since 7.0.0 | ||
| */ | ||
| private static ?WP_Connector_Registry $instance = null; | ||
|
|
||
| /** | ||
| * Holds the registered connectors. | ||
| * | ||
| * Each connector is stored as an associative array with keys: | ||
| * name, description, type, authentication, and optionally plugin. | ||
| * | ||
| * @since 7.0.0 | ||
| * @var array<string, array> | ||
| * @phpstan-var array<string, Connector> | ||
| */ | ||
| private array $registered_connectors = array(); | ||
|
|
||
| /** | ||
| * Registers a new connector. | ||
| * | ||
| * @since 7.0.0 | ||
| * | ||
| * @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|null $logo_url Optional. URL to the connector's logo image. Default null. | ||
| * @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. | ||
gziolo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * | ||
| * @phpstan-param Connector $args | ||
| * @phpstan-return Connector|null | ||
| */ | ||
| public function register( string $id, array $args ): ?array { | ||
| if ( ! preg_match( '/^[a-z0-9_]+$/', $id ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| __( | ||
| 'Connector ID must contain only lowercase alphanumeric characters and underscores.' | ||
| ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| if ( $this->is_registered( $id ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" is already registered.' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| // Validate required fields. | ||
| if ( empty( $args['name'] ) || ! is_string( $args['name'] ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" requires a non-empty "name" string.' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| if ( empty( $args['type'] ) || ! is_string( $args['type'] ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" requires a non-empty "type" string.' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| if ( ! isset( $args['authentication'] ) || ! is_array( $args['authentication'] ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" requires an "authentication" array.' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| if ( empty( $args['authentication']['method'] ) || ! in_array( $args['authentication']['method'], array( 'api_key', 'none' ), true ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" authentication method must be "api_key" or "none".' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| $connector = array( | ||
| 'name' => $args['name'], | ||
| 'description' => isset( $args['description'] ) && is_string( $args['description'] ) ? $args['description'] : '', | ||
| 'type' => $args['type'], | ||
| 'authentication' => array( | ||
| 'method' => $args['authentication']['method'], | ||
| ), | ||
| ); | ||
|
|
||
| if ( ! empty( $args['logo_url'] ) && is_string( $args['logo_url'] ) ) { | ||
| $connector['logo_url'] = $args['logo_url']; | ||
| } | ||
|
|
||
| if ( 'api_key' === $args['authentication']['method'] ) { | ||
| $connector['authentication']['credentials_url'] = $args['authentication']['credentials_url'] ?? null; | ||
| $connector['authentication']['setting_name'] = "connectors_ai_{$id}_api_key"; | ||
| } | ||
|
|
||
| if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) ) { | ||
| $connector['plugin'] = $args['plugin']; | ||
| } | ||
|
|
||
| $this->registered_connectors[ $id ] = $connector; | ||
| return $connector; | ||
| } | ||
|
|
||
| /** | ||
| * Unregisters a connector. | ||
| * | ||
| * @since 7.0.0 | ||
| * | ||
| * @param string $id The connector identifier. | ||
| * @return array|null The unregistered connector data on success, null on failure. | ||
gziolo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * | ||
| * @phpstan-return Connector|null | ||
| */ | ||
| public function unregister( string $id ): ?array { | ||
| if ( ! $this->is_registered( $id ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" not found.' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
|
|
||
| $unregistered = $this->registered_connectors[ $id ]; | ||
| unset( $this->registered_connectors[ $id ] ); | ||
|
|
||
| return $unregistered; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves the list of all registered connectors. | ||
| * | ||
| * Do not use this method directly. Instead, use the `wp_get_connectors()` function. | ||
| * | ||
| * @since 7.0.0 | ||
| * | ||
| * @see wp_get_connectors() | ||
| * | ||
| * @return array<string, array> The array of registered connectors keyed by connector ID. | ||
| * @phpstan-return array<string, Connector> | ||
| */ | ||
| public function get_all_registered(): array { | ||
| return $this->registered_connectors; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if a connector is registered. | ||
| * | ||
| * Do not use this method directly. Instead, use the `wp_is_connector_registered()` function. | ||
| * | ||
| * @since 7.0.0 | ||
| * | ||
| * @see wp_is_connector_registered() | ||
| * | ||
| * @param string $id The connector identifier. | ||
| * @return bool True if the connector is registered, false otherwise. | ||
| */ | ||
| public function is_registered( string $id ): bool { | ||
| return isset( $this->registered_connectors[ $id ] ); | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves a registered connector. | ||
| * | ||
| * Do not use this method directly. Instead, use the `wp_get_connector()` function. | ||
| * | ||
| * @since 7.0.0 | ||
| * | ||
| * @see wp_get_connector() | ||
| * | ||
| * @param string $id The connector identifier. | ||
| * @return array|null The registered connector data, or null if it is not registered. | ||
gziolo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @phpstan-return Connector|null | ||
| */ | ||
| public function get_registered( string $id ): ?array { | ||
| if ( ! $this->is_registered( $id ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| /* translators: %s: Connector ID. */ | ||
| sprintf( __( 'Connector "%s" not found.' ), esc_html( $id ) ), | ||
| '7.0.0' | ||
| ); | ||
| return null; | ||
| } | ||
| return $this->registered_connectors[ $id ]; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves the main instance of the registry class. | ||
| * | ||
| * @since 7.0.0 | ||
| * | ||
| * @return WP_Connector_Registry|null The main registry instance, or null if not yet initialized. | ||
| */ | ||
| public static function get_instance(): ?self { | ||
| return self::$instance; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the main instance of the registry class. | ||
| * | ||
| * @since 7.0.0 | ||
| * @access private | ||
| * | ||
| * @param WP_Connector_Registry $registry The registry instance. | ||
| */ | ||
| public static function set_instance( WP_Connector_Registry $registry ): void { | ||
| if ( ! doing_action( 'init' ) ) { | ||
| _doing_it_wrong( | ||
| __METHOD__, | ||
| __( 'The connector registry instance must be set during the <code>init</code> action.' ), | ||
| '7.0.0' | ||
| ); | ||
| return; | ||
| } | ||
gziolo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| self::$instance = $registry; | ||
gziolo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
gziolo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.