Changeset 62210

Timestamp:

04/06/2026 07:22:27 PM (5 months ago)

Author:

jorbin

Message:

Revert Register Akismet Anti-Spam as a connector.

This reverts [62193]. The connector for Akismet shouldn't show up when akismet is not installed. The plugin itself can register the connecter when it is activated.

Follow-up to [62193].

See #65012.
Props peterwilsoncc, jorgefilipecosta, johnbillion, eclev91, desrosj, davidbaumwald, jorbin.

Location:

trunk

Files:

• src/wp-includes/class-wp-connector-registry.php (modified) (2 diffs)
• src/wp-includes/connectors.php (modified) (4 diffs)
• tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api/rest-settings-controller.php (modified) (1 diff)
• tests/qunit/fixtures/wp-api-generated.js (modified) (2 diffs)

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

@@ -72 +72 @@
          * explicitly. If omitted, one is automatically generated using the pattern
          * `connectors_{$type}_{$id}_api_key`, with hyphens in the type and ID normalized
-         * to underscores (e.g., connector type `spam_filtering` with ID `akismet` produces
-         * `connectors_spam_filtering_akismet_api_key`). This setting name is used for the
+         * to underscores (e.g., connector type `spam_filtering` with ID `my_plugin` produces
+         * `connectors_spam_filtering_my_plugin_api_key`). This setting name is used for the
          * Settings API registration and REST API exposure.
          *
@@ -111 +111 @@
          *
          *         @type string $file The plugin's main file path relative to the plugins
-         *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
+         *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
          *     }
          * }

trunk/src/wp-includes/connectors.php

@@ -60 +60 @@
  *
  *         @type string $file The plugin's main file path relative to the plugins
- *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
+ *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
  *     }
  * }
@@ -121 +121 @@
  *
  *             @type string $file The plugin's main file path relative to the plugins
- *                                directory (e.g. 'akismet/akismet.php' or 'hello.php').
+ *                                directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
  *         }
  *     }
@@ -210 +210 @@
                 _wp_connectors_register_default_ai_providers( $registry );
         }
-
-        // Non-AI default connectors.
-        $registry->register(
-                'akismet',
-                array(
-                        'name'           => __( 'Akismet Anti-spam' ),
-                        'description'    => __( 'Protect your site from spam.' ),
-                        'type'           => 'spam_filtering',
-                        'plugin'         => array(
-                                'file' => 'akismet/akismet.php',
-                        ),
-                        'authentication' => array(
-                                'method'          => 'api_key',
-                                'credentials_url' => 'https://akismet.com/get/',
-                                'setting_name'    => 'wordpress_api_key',
-                                'constant_name'   => 'WPCOM_API_KEY',
-                        ),
-                )
-        );
 
         /**
@@ -418 +399 @@
  * @access private
  *
- * @param string $setting_name  The option name for the API key (e.g., 'connectors_spam_filtering_akismet_api_key').
- * @param string $env_var_name  Optional. Environment variable name to check (e.g., 'AKISMET_API_KEY').
- * @param string $constant_name Optional. PHP constant name to check (e.g., 'AKISMET_API_KEY').
+ * @param string $setting_name  The option name for the API key (e.g., 'connectors_spam_filtering_my_plugin_api_key').
+ * @param string $env_var_name  Optional. Environment variable name to check (e.g., 'MY_PLUGIN_API_KEY').
+ * @param string $constant_name Optional. PHP constant name to check (e.g., 'MY_PLUGIN_API_KEY').
  * @return string The key source: 'env', 'constant', 'database', or 'none'.
  */

trunk/tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php

@@ -38 +38 @@
                 $this->assertArrayHasKey( 'openai', $connectors );
                 $this->assertArrayHasKey( 'anthropic', $connectors );
-                $this->assertArrayHasKey( 'akismet', $connectors );
                 $this->assertArrayHasKey( 'mock-connectors-test', $connectors );
-                $this->assertCount( 5, $connectors );
+                $this->assertCount( 4, $connectors );
         }
 
@@ -58 +57 @@
                         $this->assertIsString( $connector_data['description'], "Connector '{$connector_id}' description should be a string." );
                         $this->assertArrayHasKey( 'type', $connector_data, "Connector '{$connector_id}' is missing 'type'." );
-                        $this->assertContains( $connector_data['type'], array( 'ai_provider', 'spam_filtering' ), "Connector '{$connector_id}' has unexpected type '{$connector_data['type']}'." );
+                        $this->assertContains( $connector_data['type'], array( 'ai_provider' ), "Connector '{$connector_id}' has unexpected type '{$connector_data['type']}'." );
                         $this->assertArrayHasKey( 'authentication', $connector_data, "Connector '{$connector_id}' is missing 'authentication'." );
                         $this->assertIsArray( $connector_data['authentication'], "Connector '{$connector_id}' authentication should be an array." );
@@ -81 +80 @@
 
                         $this->assertArrayHasKey( 'setting_name', $connector_data['authentication'], "Connector '{$connector_id}' authentication is missing 'setting_name'." );
-
-                        // AI providers use the connectors_ai_{id}_api_key convention.
-                        // Non-AI connectors may use custom setting names.
-                        if ( 'ai_provider' === $connector_data['type'] ) {
-                                $this->assertSame(
-                                        'connectors_ai_' . str_replace( '-', '_', $connector_id ) . '_api_key',
-                                        $connector_data['authentication']['setting_name'] ?? null,
-                                        "Connector '{$connector_id}' setting_name does not match expected format."
-                                );
-                        }
+                        $this->assertSame(
+                                'connectors_ai_' . str_replace( '-', '_', $connector_id ) . '_api_key',
+                                $connector_data['authentication']['setting_name'] ?? null,
+                                "Connector '{$connector_id}' setting_name does not match expected format."
+                        );
                 }
 

trunk/tests/phpunit/tests/rest-api/rest-settings-controller.php

@@ -120 +120 @@
                         'default_comment_status',
                         'site_icon', // Registered in wp-includes/blocks/site-logo.php
-                        'wordpress_api_key', // Registered by Akismet connector.
                         'wp_collaboration_enabled',
                 );

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -11012 +11012 @@
                     ],
                     "args": {
-                        "wordpress_api_key": {
-                            "title": "Akismet Anti-spam API Key",
-                            "description": "API key for the Akismet Anti-spam connector.",
-                            "type": "string",
-                            "required": false
-                        },
                         "title": {
                             "title": "Title",
@@ -14551 +14545 @@
 
 mockedApiResponse.settings = {
-    "wordpress_api_key": "",
     "title": "Test Blog",
     "description": "",