Changeset 62192

Timestamp:

04/01/2026 02:56:47 PM (10 hours ago)

Author:

jorgefilipecosta

Message:

Connectors: Replace plugin.slug with plugin.file in connector registration.

Use the plugin's main file path relative to the plugins directory
(e.g. akismet/akismet.php or hello.php) instead of the WordPress.org slug
to identify a connector's associated plugin.
This lets _wp_connectors_get_connector_script_module_data() check plugin
status with file_exists() and is_plugin_active() directly, removing the
get_plugins() slug-to-file mapping that was previously needed.

Props jorgefilipecosta, mukesh27, gziolo.
Fixes #65002.

Location:

trunk

Files:

• src/wp-includes/class-wp-connector-registry.php (modified) (3 diffs)
• src/wp-includes/connectors.php (modified) (9 diffs)
• tests/phpunit/tests/connectors/wpConnectorRegistry.php (modified) (1 diff)

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

@@ -41 +41 @@
  *     },
  *     plugin?: array{
- *         slug: non-empty-string
+ *         file: non-empty-string
  *     }
  * }
@@ -110 +110 @@
      *         Optional. Plugin data for install/activate UI.
      *
-     *         @type string $slug The WordPress.org plugin slug.
+     *         @type string $file The plugin's main file path relative to the plugins
+     *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
      *     }
      * }
@@ -243 +244 @@
         }
 
-        if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) ) {
-            $connector['plugin'] = $args['plugin'];
+        if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) && ! empty( $args['plugin']['file'] ) ) {
+            $connector['plugin'] = array( 'file' => $args['plugin']['file'] );
         }
 

trunk/src/wp-includes/connectors.php

@@ -59 +59 @@
  *         Optional. Plugin data for install/activate UI.
  *
- *         @type string $slug The WordPress.org plugin slug.
+ *         @type string $file The plugin's main file path relative to the plugins
+ *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
  *     }
  * }
@@ -75 +76 @@
  *     },
  *     plugin?: array{
- *         slug: non-empty-string
+ *         file: non-empty-string
  *     }
  * }
@@ -119 +120 @@
  *             Optional. Plugin data for install/activate UI.
  *
- *             @type string $slug The WordPress.org plugin slug.
+ *             @type string $file The plugin's main file path relative to the plugins
+ *                                directory (e.g. 'akismet/akismet.php' or 'hello.php').
  *         }
  *     }
@@ -136 +138 @@
  *     },
  *     plugin?: array{
- *         slug: non-empty-string
+ *         file: non-empty-string
  *     }
  * }>
@@ -257 +259 @@
             'type'           => 'ai_provider',
             'plugin'         => array(
-                'slug' => 'ai-provider-for-anthropic',
+                'file' => 'ai-provider-for-anthropic/plugin.php',
             ),
             'authentication' => array(
@@ -269 +271 @@
             'type'           => 'ai_provider',
             'plugin'         => array(
-                'slug' => 'ai-provider-for-google',
+                'file' => 'ai-provider-for-google/plugin.php',
             ),
             'authentication' => array(
@@ -281 +283 @@
             'type'           => 'ai_provider',
             'plugin'         => array(
-                'slug' => 'ai-provider-for-openai',
+                'file' => 'ai-provider-for-openai/plugin.php',
             ),
             'authentication' => array(
@@ -637 +639 @@
     $registry = AiClient::defaultRegistry();
 
-    // Build a slug-to-file map for plugin installation status.
-    if ( ! function_exists( 'get_plugins' ) ) {
+    if ( ! function_exists( 'is_plugin_active' ) ) {
         require_once ABSPATH . 'wp-admin/includes/plugin.php';
-    }
-    $plugin_files_by_slug = array();
-    foreach ( array_keys( get_plugins() ) as $plugin_file ) {
-        $slug                          = str_contains( $plugin_file, '/' ) ? dirname( $plugin_file ) : str_replace( '.php', '', $plugin_file );
-        $plugin_files_by_slug[ $slug ] = $plugin_file;
     }
 
@@ -677 +673 @@
         );
 
-        if ( ! empty( $connector_data['plugin']['slug'] ) ) {
-            $plugin_slug = $connector_data['plugin']['slug'];
-            $plugin_file = $plugin_files_by_slug[ $plugin_slug ] ?? null;
-
-            $is_installed = null !== $plugin_file;
-            $is_activated = $is_installed && is_plugin_active( $plugin_file );
+        if ( ! empty( $connector_data['plugin']['file'] ) ) {
+            $file         = $connector_data['plugin']['file'];
+            $is_installed = file_exists( wp_normalize_path( WP_PLUGIN_DIR . '/' . $file ) );
+            $is_activated = $is_installed && is_plugin_active( $file );
 
             $connector_out['plugin'] = array(
-                'slug'        => $plugin_slug,
-                'pluginFile'  => $is_installed
-                    ? ( str_ends_with( $plugin_file, '.php' ) ? substr( $plugin_file, 0, -4 ) : $plugin_file )
-                    : null,
+                'file'        => $file,
+                'isInstalled' => $is_installed,
                 'isActivated' => $is_activated,
             );

trunk/tests/phpunit/tests/connectors/wpConnectorRegistry.php

@@ -295 +295 @@
     public function test_register_includes_plugin_data() {
         $args           = self::$default_args;
-        $args['plugin'] = array( 'slug' => 'my-plugin' );
+        $args['plugin'] = array( 'file' => 'my-plugin/my-plugin.php' );
 
         $result = $this->registry->register( 'with-plugin', $args );
 
         $this->assertArrayHasKey( 'plugin', $result );
-        $this->assertSame( array( 'slug' => 'my-plugin' ), $result['plugin'] );
+        $this->assertSame( array( 'file' => 'my-plugin/my-plugin.php' ), $result['plugin'] );
     }