Merge branch 'trunk' into add/context-for-scale

Author: shail-mehta

composer.json

@@ -32,6 +32,11 @@
 		},
 		"lock": false
 	},
+	"autoload-dev": {
+		"psr-4": {
+			"WordPress\\PHPStan\\": "tests/phpstan/"
+		}
+	},
 	"scripts": {
 		"phpstan": "@php ./vendor/bin/phpstan analyse --memory-limit=2G",
 		"compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source",

src/wp-admin/css/common.css

@@ -961,7 +961,6 @@ a#remove-post-thumbnail:hover,
 
 #publishing-action .spinner {
 	float: none;
-	margin-top: 5px;
 }
 
 #misc-publishing-actions {
@@ -2460,7 +2459,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 	filter: alpha(opacity=70);
 	width: 20px;
 	height: 20px;
-	margin: 4px 10px 0;
+	margin: 10px 10px 0;
 }
 
 .spinner.is-active,
@@ -2480,6 +2479,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 }
 #template .submit .spinner {
 	float: none;
+	vertical-align: top;
 }
 
 .metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */

src/wp-admin/css/customize-controls.css

@@ -572,6 +572,10 @@ body.trashing #publish-settings {
 	display: block;
 }
 
+.accordion-section-title button.accordion-trigger .spinner {
+	margin-top: 0;
+}
+
 @media (prefers-reduced-motion: reduce) {
 	#customize-theme-controls .accordion-section-title,
 	#customize-outer-theme-controls .accordion-section-title {

src/wp-admin/css/dashboard.css

@@ -60,7 +60,6 @@
 	/* Required min-height to make the jQuery UI Sortable drop zone work. */
 	min-height: 0;
 	margin: 0 8px 20px;
-	padding: 0;
 }
 
 #dashboard-widgets .meta-box-sortables:not(:empty) {

src/wp-admin/css/edit.css

@@ -173,10 +173,6 @@ body.post-type-wp_navigation .inline-edit-status {
 
 /* Post Screen */
 
-.metabox-holder .postbox-container .meta-box-sortables {
-	padding: 4px;
-}
-
 /* Only highlight drop zones when dragging and only in the 2 columns layout. */
 .is-dragging-metaboxes .metabox-holder .postbox-container .meta-box-sortables {
 	border-radius: 8px;

src/wp-admin/css/list-tables.css

@@ -1609,7 +1609,7 @@ div.action-links,
 }
 
 .plugin-card h3 {
-	margin: 0 12px 12px 0;
+	margin: 0 12px 16px 0;
 	font-size: 18px;
 	line-height: 1.3;
 }

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

@@ -40,7 +40,8 @@
  *         env_var_name?: non-empty-string
  *     },
  *     plugin?: array{
- *         file: non-empty-string
+ *         file: non-empty-string,
+ *         is_active?: callable(): bool
  *     }
  * }
  */
@@ -109,8 +110,12 @@ final class WP_Connector_Registry {
 	 *     @type array  $plugin         {
 	 *         Optional. Plugin data for install/activate UI.
 	 *
-	 *         @type string $file The plugin's main file path relative to the plugins
-	 *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
+	 *         @type string   $file      Optional. The plugin's main file path relative to the
+	 *                                   plugins 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.
@@ -243,8 +248,30 @@ public function register( string $id, array $args ): ?array {
 			}
 		}
 
-		if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) && ! empty( $args['plugin']['file'] ) ) {
-			$connector['plugin'] = array( 'file' => $args['plugin']['file'] );
+		$connector['plugin'] = array();
+
+		if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) ) {
+			if ( ! empty( $args['plugin']['file'] ) ) {
+				$connector['plugin']['file'] = $args['plugin']['file'];
+			}
+
+			if ( isset( $args['plugin']['is_active'] ) ) {
+				if ( ! is_callable( $args['plugin']['is_active'] ) ) {
+					_doing_it_wrong(
+						__METHOD__,
+						/* translators: %s: Connector ID. */
+						sprintf( __( 'Connector "%s" plugin is_active must be callable.' ), esc_html( $id ) ),
+						'7.0.0'
+					);
+					return null;
+				}
+
+				$connector['plugin']['is_active'] = $args['plugin']['is_active'];
+			}
+		}
+
+		if ( ! isset( $connector['plugin']['is_active'] ) ) {
+			$connector['plugin']['is_active'] = '__return_true';
 		}
 
 		$this->registered_connectors[ $id ] = $connector;

src/wp-includes/connectors.php

@@ -367,6 +367,17 @@ function _wp_connectors_register_default_ai_providers( WP_Connector_Registry $re
 				}
 			}
 		}
+
+		if ( ! isset( $args['plugin']['is_active'] ) ) {
+			$args['plugin']['is_active'] = static function () use ( $ai_registry, $id ): bool {
+				try {
+					return $ai_registry->hasProvider( $id );
+				} catch ( Exception $e ) {
+					return false;
+				}
+			};
+		}
+
 		$registry->register( $id, $args );
 	}
 }
@@ -538,10 +549,9 @@ function _wp_connectors_rest_settings_dispatch( WP_REST_Response $response, WP_R
  * @access private
  */
 function _wp_register_default_connector_settings(): void {
-	$ai_registry         = AiClient::defaultRegistry();
 	$registered_settings = get_registered_settings();
 
-	foreach ( wp_get_connectors() as $connector_id => $connector_data ) {
+	foreach ( wp_get_connectors() as $connector_data ) {
 		$auth = $connector_data['authentication'];
 		if ( 'api_key' !== $auth['method'] || empty( $auth['setting_name'] ) ) {
 			continue;
@@ -552,8 +562,11 @@ function _wp_register_default_connector_settings(): void {
 			continue;
 		}
 
-		// For AI providers, skip if the provider is not in the AI Client registry.
-		if ( 'ai_provider' === $connector_data['type'] && ! $ai_registry->hasProvider( $connector_id ) ) {
+		if ( ! isset( $connector_data['plugin']['is_active'] ) || ! is_callable( $connector_data['plugin']['is_active'] ) ) {
+			continue;
+		}
+
+		if ( ! call_user_func( $connector_data['plugin']['is_active'] ) ) {
 			continue;
 		}
 
@@ -638,10 +651,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,8 +683,8 @@ function _wp_connectors_get_connector_script_module_data( array $data ): array {
 
 		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 );
+			$is_activated = (bool) call_user_func( $connector_data['plugin']['is_active'] );
+			$is_installed = $is_activated || file_exists( wp_normalize_path( WP_PLUGIN_DIR . '/' . $file ) );
 
 			$connector_out['plugin'] = array(
 				'file'        => $file,

src/wp-includes/http.php

@@ -716,6 +716,26 @@ function ms_allowed_http_request_hosts( $is_external, $host ) {
  *               When a specific component has been requested: null if the component
  *               doesn't exist in the given URL; a string or - in the case of
  *               PHP_URL_PORT - integer when it does. See parse_url()'s return values.
+ *
+ * @phpstan-param int<-1, 7> $component
+ * @phpstan-return (
+ *     $component is -1
+ *         ? false|array{
+ *               scheme?: string,
+ *               host?: string,
+ *               port?: int<0, 65535>,
+ *               user?: string,
+ *               pass?: string,
+ *               path?: string,
+ *               query?: string,
+ *               fragment?: string,
+ *           }
+ *         : (
+ *             $component is 2
+ *                 ? int<0, 65535>|null
+ *                 : string|null
+ *         )
+ * )
  */
 function wp_parse_url( $url, $component = -1 ) {
 	$to_unset = array();
@@ -763,6 +783,36 @@ function wp_parse_url( $url, $component = -1 ) {
  *               When a specific component has been requested: null if the component
  *               doesn't exist in the given URL; a string or - in the case of
  *               PHP_URL_PORT - integer when it does. See parse_url()'s return values.
+ *
+ * @phpstan-param false|array{
+ *     scheme?: string,
+ *     host?: string,
+ *     port?: int<0, 65535>,
+ *     user?: string,
+ *     pass?: string,
+ *     path?: string,
+ *     query?: string,
+ *     fragment?: string,
+ * } $url_parts
+ * @phpstan-param int<-1, 7> $component
+ * @phpstan-return (
+ *     $component is -1
+ *         ? false|array{
+ *               scheme?: string,
+ *               host?: string,
+ *               port?: int<0, 65535>,
+ *               user?: string,
+ *               pass?: string,
+ *               path?: string,
+ *               query?: string,
+ *               fragment?: string,
+ *           }
+ *         : (
+ *             $component is 2
+ *                 ? int<0, 65535>|null
+ *                 : string|null
+ *         )
+ * )
  */
 function _get_component_from_parsed_url_array( $url_parts, $component = -1 ) {
 	if ( -1 === $component ) {
@@ -789,6 +839,9 @@ function _get_component_from_parsed_url_array( $url_parts, $component = -1 ) {
  *
  * @param int $constant PHP_URL_* constant.
  * @return string|false The named key or false.
+ *
+ * @phpstan-param int<-1, 7> $constant
+ * @phpstan-return 'scheme'|'host'|'port'|'user'|'pass'|'path'|'query'|'fragment'|false
  */
 function _wp_translate_php_url_constant_to_key( $constant ) {
 	$translation = array(

src/wp-includes/l10n.php

@@ -1206,6 +1206,7 @@ function load_script_module_textdomain( string $id, string $domain = 'default',
  * @return string|false The JSON-encoded translated strings on success, false otherwise.
  */
 function _load_script_textdomain_from_src( string $handle, string $src, string $domain, string $path, bool $is_module ) {
+	/** @var WP_Textdomain_Registry $wp_textdomain_registry */
 	global $wp_textdomain_registry;
 
 	$locale = determine_locale();
@@ -1214,7 +1215,9 @@ function _load_script_textdomain_from_src( string $handle, string $src, string $
 		$path = $wp_textdomain_registry->get( $domain, $locale );
 	}
 
-	$path = untrailingslashit( $path );
+	if ( $path ) {
+		$path = untrailingslashit( $path );
+	}
 
 	// If a path was given and the handle file exists simply return it.
 	$file_base       = 'default' === $domain ? $locale : $domain . '-' . $locale;
@@ -1231,8 +1234,17 @@ function _load_script_textdomain_from_src( string $handle, string $src, string $
 	$relative       = false;
 	$languages_path = WP_LANG_DIR;
 
-	$src_url     = wp_parse_url( $src );
+	$src_url = wp_parse_url( $src );
+	if ( ! $src_url ) {
+		return load_script_translations( false, $handle, $domain );
+	}
+	$src_url['path'] ??= '';
+
 	$content_url = wp_parse_url( content_url() );
+	if ( ! $content_url ) {
+		return load_script_translations( false, $handle, $domain );
+	}
+
 	$plugins_url = wp_parse_url( plugins_url() );
 	$site_url    = wp_parse_url( site_url() );
 	$theme_root  = get_theme_root();
@@ -1304,7 +1316,7 @@ function _load_script_textdomain_from_src( string $handle, string $src, string $
 	$relative = apply_filters( 'load_script_textdomain_relative_path', $relative, $src, $is_module );
 
 	// If the source is not from WP.
-	if ( false === $relative ) {
+	if ( ! is_string( $relative ) ) {
 		return load_script_translations( false, $handle, $domain );
 	}