Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into add/isset-checks

westonruter · westonruter · commit 9fc4723be279 · 2026-03-02T16:02:19.000-08:00
diff --git a/src/js/_enqueues/wp/sanitize.js b/src/js/_enqueues/wp/sanitize.js
@@ -23,7 +23,7 @@
 		 * @return {string} Stripped text.
 		 */
 		stripTags: function( text ) {
-			if ( ! text ) {
+			if ( 'string' !== typeof text ) {
 				return '';
 			}
 
diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css
@@ -117,14 +117,14 @@
 
 .iris-picker .ui-square-handle:focus,
 .iris-picker .iris-strip .ui-slider-handle:focus {
-	border-color: #3582c4;
+	border-color: var(--wp-admin-theme-color, #3858e9);
 	border-style: solid;
-	box-shadow: 0 0 0 1px #3582c4;
+	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);
 	outline: 2px solid transparent;
 }
 
 .iris-picker .iris-palette:focus {
-	box-shadow: 0 0 0 2px #3582c4;
+	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);
 }
 
 @media screen and (max-width: 782px) {
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
@@ -812,10 +812,10 @@ img.emoji {
 	content: "\f153";
 	content: "\f153" / '';
 	display: block;
-	font: normal 20px/24px dashicons;
-	height: 24px;
+	font: normal 20px/1 dashicons;
+	height: 1em;
 	text-align: center;
-	width: 24px;
+	width: 1em;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
@@ -613,9 +613,9 @@ body.trashing #publish-settings {
 #customize-controls .control-section .accordion-section-title button:hover,
 #customize-controls .control-section.open .accordion-section-title,
 #customize-controls .control-section .accordion-section-title button:focus {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color, #3858e9);
 	background: #f6f7f7;
-	border-left-color: #2271b1;
+	border-left-color: var(--wp-admin-theme-color, #3858e9);
 }
 
 #accordion-section-themes + .control-section {
diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
@@ -72,6 +72,7 @@
 	outline-offset: -2px;
 	border-radius: 8px;
 	height: 250px;
+	margin: 4px;
 }
 
 /* Only highlight drop zones when dragging. */
diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
@@ -257,7 +257,7 @@
 .vim-current,
 .vim-current th,
 .vim-current td {
-	background-color: #f0f6fc !important;
+	background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08) !important;
 }
 
 th .comment-grey-bubble {
@@ -1194,7 +1194,7 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
 }
 
 #bulk-titles .ntdelbutton:focus {
-	box-shadow: 0 0 0 2px #3582c4;
+	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
 	/* Reset inherited offset from Gutenberg */
@@ -1270,7 +1270,7 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
 
 .plugins .active td,
 .plugins .active th {
-	background-color: #f0f6fc;
+	background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08);
 }
 
 .plugins .update th,
@@ -1311,7 +1311,7 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
 
 .plugins .active th.check-column,
 .plugin-update-tr.active td {
-	border-left: 4px solid #72aee6;
+	border-left: 4px solid var(--wp-admin-theme-color);
 }
 
 .wp-list-table.plugins .plugin-title,
@@ -2330,8 +2330,8 @@ div.action-links,
 
 	.plugins .active.update + .plugin-update-tr:before,
 	.plugins .active.updated + .plugin-update-tr:before {
-		background-color: #f0f6fc;
-		border-left: 4px solid #72aee6;
+		background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08);
+		border-left: 4px solid var(--wp-admin-theme-color);
 	}
 
 	.plugins .plugin-update-tr .update-message {
diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
@@ -1193,7 +1193,7 @@ public static function restore_image_outer_container( $block_content ) {
 
 		$inner_classnames = explode( ' ', $tags->get_attribute( 'class' ) );
 		foreach ( $inner_classnames as $classname ) {
-			if ( 0 === strpos( $classname, 'wp-duotone' ) ) {
+			if ( str_starts_with( $classname, 'wp-duotone' ) ) {
 				$tags->remove_class( $classname );
 				$tags->seek( 'wrapper-div' );
 				$tags->add_class( $classname );
diff --git a/src/wp-includes/class-wp-recovery-mode-key-service.php b/src/wp-includes/class-wp-recovery-mode-key-service.php
@@ -39,7 +39,7 @@ public function generate_recovery_mode_token() {
 	 * @since 5.2.0
 	 * @since 6.8.0 The stored key is now hashed using wp_fast_hash() instead of phpass.
 	 *
-	 * @param string $token A token generated by {@see generate_recovery_mode_token()}.
+	 * @param string $token A token generated by {@see WP_Recovery_Mode_Key_Service::generate_recovery_mode_token()}.
 	 * @return string Recovery mode key.
 	 */
 	public function generate_and_store_recovery_mode_key( $token ) {
diff --git a/src/wp-includes/class-wp-recovery-mode-link-service.php b/src/wp-includes/class-wp-recovery-mode-link-service.php
@@ -101,8 +101,8 @@ public function handle_begin_link( $ttl ) {
 	 *
 	 * @since 5.2.0
 	 *
-	 * @param string $token Recovery Mode token created by {@see generate_recovery_mode_token()}.
-	 * @param string $key   Recovery Mode key created by {@see generate_and_store_recovery_mode_key()}.
+	 * @param string $token Recovery Mode token created by {@see WP_Recovery_Mode_Key_Service::generate_recovery_mode_token()}.
+	 * @param string $key   Recovery Mode key created by {@see WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key()}.
 	 * @return string Recovery mode begin URL.
 	 */
 	private function get_recovery_mode_begin_url( $token, $key ) {
diff --git a/src/wp-includes/php-ai-client/src/AiClient.php b/src/wp-includes/php-ai-client/src/AiClient.php
@@ -84,7 +84,7 @@ class AiClient
     /**
      * @var string The version of the AI Client.
      */
-    public const VERSION = '1.1.0';
+    public const VERSION = '1.2.1';
     /**
      * @var ProviderRegistry|null The default provider registry instance.
      */
diff --git a/src/wp-includes/php-ai-client/src/Providers/DTO/ProviderMetadata.php b/src/wp-includes/php-ai-client/src/Providers/DTO/ProviderMetadata.php
@@ -13,10 +13,12 @@
  * unique identifier, display name, and type (cloud, server, or client).
  *
  * @since 0.1.0
+ * @since 1.2.0 Added optional description property.
  *
  * @phpstan-type ProviderMetadataArrayShape array{
  *     id: string,
  *     name: string,
+ *     description?: ?string,
  *     type: string,
  *     credentialsUrl?: ?string,
  *     authenticationMethod?: ?string
@@ -28,6 +30,7 @@ class ProviderMetadata extends AbstractDataTransferObject
 {
     public const KEY_ID = 'id';
     public const KEY_NAME = 'name';
+    public const KEY_DESCRIPTION = 'description';
     public const KEY_TYPE = 'type';
     public const KEY_CREDENTIALS_URL = 'credentialsUrl';
     public const KEY_AUTHENTICATION_METHOD = 'authenticationMethod';
@@ -39,6 +42,10 @@ class ProviderMetadata extends AbstractDataTransferObject
      * @var string The provider's display name.
      */
     protected string $name;
+    /**
+     * @var string|null The provider's description.
+     */
+    protected ?string $description;
     /**
      * @var ProviderTypeEnum The provider type.
      */
@@ -55,17 +62,20 @@ class ProviderMetadata extends AbstractDataTransferObject
      * Constructor.
      *
      * @since 0.1.0
+     * @since 1.2.0 Added optional $description parameter.
      *
      * @param string $id The provider's unique identifier.
      * @param string $name The provider's display name.
      * @param ProviderTypeEnum $type The provider type.
      * @param string|null $credentialsUrl The URL where users can get credentials.
      * @param RequestAuthenticationMethod|null $authenticationMethod The authentication method.
+     * @param string|null $description The provider's description.
      */
-    public function __construct(string $id, string $name, ProviderTypeEnum $type, ?string $credentialsUrl = null, ?RequestAuthenticationMethod $authenticationMethod = null)
+    public function __construct(string $id, string $name, ProviderTypeEnum $type, ?string $credentialsUrl = null, ?RequestAuthenticationMethod $authenticationMethod = null, ?string $description = null)
     {
         $this->id = $id;
         $this->name = $name;
+        $this->description = $description;
         $this->type = $type;
         $this->credentialsUrl = $credentialsUrl;
         $this->authenticationMethod = $authenticationMethod;
@@ -92,6 +102,17 @@ public function getName(): string
     {
         return $this->name;
     }
+    /**
+     * Gets the provider's description.
+     *
+     * @since 1.2.0
+     *
+     * @return string|null The provider description.
+     */
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
     /**
      * Gets the provider type.
      *
@@ -129,30 +150,33 @@ public function getAuthenticationMethod(): ?RequestAuthenticationMethod
      * {@inheritDoc}
      *
      * @since 0.1.0
+     * @since 1.2.0 Added description to schema.
      */
     public static function getJsonSchema(): array
     {
-        return ['type' => 'object', 'properties' => [self::KEY_ID => ['type' => 'string', 'description' => 'The provider\'s unique identifier.'], self::KEY_NAME => ['type' => 'string', 'description' => 'The provider\'s display name.'], self::KEY_TYPE => ['type' => 'string', 'enum' => ProviderTypeEnum::getValues(), 'description' => 'The provider type (cloud, server, or client).'], self::KEY_CREDENTIALS_URL => ['type' => 'string', 'description' => 'The URL where users can get credentials.'], self::KEY_AUTHENTICATION_METHOD => ['type' => ['string', 'null'], 'enum' => array_merge(RequestAuthenticationMethod::getValues(), [null]), 'description' => 'The authentication method.']], 'required' => [self::KEY_ID, self::KEY_NAME, self::KEY_TYPE]];
+        return ['type' => 'object', 'properties' => [self::KEY_ID => ['type' => 'string', 'description' => 'The provider\'s unique identifier.'], self::KEY_NAME => ['type' => 'string', 'description' => 'The provider\'s display name.'], self::KEY_DESCRIPTION => ['type' => 'string', 'description' => 'The provider\'s description.'], self::KEY_TYPE => ['type' => 'string', 'enum' => ProviderTypeEnum::getValues(), 'description' => 'The provider type (cloud, server, or client).'], self::KEY_CREDENTIALS_URL => ['type' => 'string', 'description' => 'The URL where users can get credentials.'], self::KEY_AUTHENTICATION_METHOD => ['type' => ['string', 'null'], 'enum' => array_merge(RequestAuthenticationMethod::getValues(), [null]), 'description' => 'The authentication method.']], 'required' => [self::KEY_ID, self::KEY_NAME, self::KEY_TYPE]];
     }
     /**
      * {@inheritDoc}
      *
      * @since 0.1.0
+     * @since 1.2.0 Added description to output.
      *
      * @return ProviderMetadataArrayShape
      */
     public function toArray(): array
     {
-        return [self::KEY_ID => $this->id, self::KEY_NAME => $this->name, self::KEY_TYPE => $this->type->value, self::KEY_CREDENTIALS_URL => $this->credentialsUrl, self::KEY_AUTHENTICATION_METHOD => $this->authenticationMethod ? $this->authenticationMethod->value : null];
+        return [self::KEY_ID => $this->id, self::KEY_NAME => $this->name, self::KEY_DESCRIPTION => $this->description, self::KEY_TYPE => $this->type->value, self::KEY_CREDENTIALS_URL => $this->credentialsUrl, self::KEY_AUTHENTICATION_METHOD => $this->authenticationMethod ? $this->authenticationMethod->value : null];
     }
     /**
      * {@inheritDoc}
      *
      * @since 0.1.0
+     * @since 1.2.0 Added description support.
      */
     public static function fromArray(array $array): self
     {
         static::validateFromArrayData($array, [self::KEY_ID, self::KEY_NAME, self::KEY_TYPE]);
-        return new self($array[self::KEY_ID], $array[self::KEY_NAME], ProviderTypeEnum::from($array[self::KEY_TYPE]), $array[self::KEY_CREDENTIALS_URL] ?? null, isset($array[self::KEY_AUTHENTICATION_METHOD]) ? RequestAuthenticationMethod::from($array[self::KEY_AUTHENTICATION_METHOD]) : null);
+        return new self($array[self::KEY_ID], $array[self::KEY_NAME], ProviderTypeEnum::from($array[self::KEY_TYPE]), $array[self::KEY_CREDENTIALS_URL] ?? null, isset($array[self::KEY_AUTHENTICATION_METHOD]) ? RequestAuthenticationMethod::from($array[self::KEY_AUTHENTICATION_METHOD]) : null, $array[self::KEY_DESCRIPTION] ?? null);
     }
 }
diff --git a/src/wp-includes/php-ai-client/src/Providers/Http/Enums/RequestAuthenticationMethod.php b/src/wp-includes/php-ai-client/src/Providers/Http/Enums/RequestAuthenticationMethod.php
@@ -27,6 +27,8 @@ class RequestAuthenticationMethod extends AbstractEnum
      * @since 0.4.0
      *
      * @return class-string<RequestAuthenticationInterface&WithArrayTransformationInterface> The implementation class.
+     *
+     * @phpstan-ignore missingType.generics
      */
     public function getImplementationClass(): string
     {
diff --git a/src/wp-includes/php-ai-client/src/Providers/Http/HttpTransporter.php b/src/wp-includes/php-ai-client/src/Providers/Http/HttpTransporter.php
@@ -260,6 +260,7 @@ private function convertFromPsr7Response(ResponseInterface $psr7Response): Respo
         return new Response(
             $psr7Response->getStatusCode(),
             $psr7Response->getHeaders(),
+            // @phpstan-ignore-line
             $body === '' ? null : $body
         );
     }
diff --git a/src/wp-includes/php-ai-client/src/Providers/Models/DTO/SupportedOption.php b/src/wp-includes/php-ai-client/src/Providers/Models/DTO/SupportedOption.php
@@ -4,6 +4,7 @@
 namespace WordPress\AiClient\Providers\Models\DTO;
 
 use WordPress\AiClient\Common\AbstractDataTransferObject;
+use WordPress\AiClient\Common\AbstractEnum;
 use WordPress\AiClient\Common\Exception\InvalidArgumentException;
 use WordPress\AiClient\Providers\Models\Enums\OptionEnum;
 /**
@@ -78,19 +79,62 @@ public function isSupportedValue($value): bool
         }
         // If the value is an array, consider it a set (i.e. order doesn't matter).
         if (is_array($value)) {
-            sort($value);
+            $normalizedValue = self::normalizeArrayForComparison($value);
             foreach ($this->supportedValues as $supportedValue) {
                 if (!is_array($supportedValue)) {
                     continue;
                 }
-                sort($supportedValue);
-                if ($value === $supportedValue) {
+                $normalizedSupported = self::normalizeArrayForComparison($supportedValue);
+                if ($normalizedValue === $normalizedSupported) {
                     return \true;
                 }
             }
             return \false;
         }
-        return in_array($value, $this->supportedValues, \true);
+        $normalizedValue = self::normalizeValue($value);
+        foreach ($this->supportedValues as $supportedValue) {
+            if (self::normalizeValue($supportedValue) === $normalizedValue) {
+                return \true;
+            }
+        }
+        return \false;
+    }
+    /**
+     * Normalizes an AbstractEnum instance to its string value.
+     *
+     * This ensures comparisons work correctly even after deserialization
+     * (e.g. Redis/Memcached object cache), where AbstractEnum singletons
+     * are reconstructed as separate instances.
+     *
+     * @since 1.2.1
+     *
+     * @param mixed $value The value to normalize.
+     * @return mixed The normalized value.
+     */
+    private static function normalizeValue($value)
+    {
+        if ($value instanceof AbstractEnum) {
+            return $value->value;
+        }
+        return $value;
+    }
+    /**
+     * Normalizes and sorts an array for comparison.
+     *
+     * Maps each element through normalizeValue() and sorts the result,
+     * ensuring consistent comparison regardless of element order or
+     * AbstractEnum instance identity.
+     *
+     * @since 1.2.1
+     *
+     * @param array<mixed> $items The array to normalize.
+     * @return array<mixed> The normalized, sorted array.
+     */
+    private static function normalizeArrayForComparison(array $items): array
+    {
+        $normalized = array_map([self::class, 'normalizeValue'], $items);
+        sort($normalized);
+        return $normalized;
     }
     /**
      * Gets the supported values for this option.
diff --git a/src/wp-login.php b/src/wp-login.php
@@ -184,7 +184,7 @@ function login_header( $title = null, $message = '', $wp_error = null ) {
 		}
 	}
 
-	$classes[] = ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+	$classes[] = 'locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
 	/**
 	 * Filters the login page body classes.
diff --git a/tests/phpunit/tests/ai-client/wpAiClientAbilityFunctionResolver.php b/tests/phpunit/tests/ai-client/wpAiClientAbilityFunctionResolver.php
@@ -6,7 +6,6 @@
  * @covers WP_AI_Client_Ability_Function_Resolver
  */
 
-use WordPress\AiClient\Messages\DTO\Message;
 use WordPress\AiClient\Messages\DTO\MessagePart;
 use WordPress\AiClient\Messages\DTO\ModelMessage;
 use WordPress\AiClient\Messages\DTO\UserMessage;
diff --git a/tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php b/tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php
@@ -8,7 +8,6 @@
 
 use WordPress\AiClient\AiClient;
 use WordPress\AiClient\Files\DTO\File;
-use WordPress\AiClient\Files\Enums\FileTypeEnum;
 use WordPress\AiClient\Messages\DTO\Message;
 use WordPress\AiClient\Messages\DTO\MessagePart;
 use WordPress\AiClient\Messages\DTO\ModelMessage;
diff --git a/tests/qunit/wp-includes/js/wp-sanitize.js b/tests/qunit/wp-includes/js/wp-sanitize.js
@@ -17,9 +17,11 @@ QUnit.test( 'stripTags should strip tags from string', function( assert ) {
 	assert.strictEqual( result, 'Hello World', 'stripTags( "<p>Hello <b>World</b></p>" ) should return "Hello World"' );
 } );
 
-QUnit.test( 'stripTags should convert numbers to strings', function( assert ) {
-	const result = wp.sanitize.stripTags( 123 );
-	assert.strictEqual( result, '123', 'stripTags( 123 ) should return "123"' );
+QUnit.test( 'stripTags should return empty string for truthy non-strings', function( assert ) {
+	assert.strictEqual( wp.sanitize.stripTags( 123 ), '', 'stripTags( 123 ) should return ""' );
+	assert.strictEqual( wp.sanitize.stripTags( true ), '', 'stripTags( true ) should return ""' );
+	assert.strictEqual( wp.sanitize.stripTags( [ 6, 7 ] ), '', 'stripTags( [ 6, 7 ] ) should return ""' );
+	assert.strictEqual( wp.sanitize.stripTags( { foo: 'bar' } ), '', 'stripTags( ( { foo: \'bar\' } ) should return ""' );
 } );
 
 QUnit.test( 'stripTags should return empty string for input 0', function( assert ) {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* @return {string} Stripped text.`
`24`	`24`	`*/`
`25`	`25`	`stripTags: function( text ) {`
`26`		`- if ( ! text ) {`
	`26`	`+ if ( 'string' !== typeof text ) {`
`27`	`27`	`return '';`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@`
`72`	`72`	`outline-offset: -2px;`
`73`	`73`	`border-radius: 8px;`
`74`	`74`	`height: 250px;`
	`75`	`+ margin: 4px;`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`/* Only highlight drop zones when dragging. */`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function generate_recovery_mode_token() {`
`39`	`39`	`* @since 5.2.0`
`40`	`40`	`* @since 6.8.0 The stored key is now hashed using wp_fast_hash() instead of phpass.`
`41`	`41`	`*`
`42`		`- * @param string $token A token generated by {@see generate_recovery_mode_token()}.`
	`42`	`+ * @param string $token A token generated by {@see WP_Recovery_Mode_Key_Service::generate_recovery_mode_token()}.`
`43`	`43`	`* @return string Recovery mode key.`
`44`	`44`	`*/`
`45`	`45`	`public function generate_and_store_recovery_mode_key( $token ) {`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ public function handle_begin_link( $ttl ) {`
`101`	`101`	`*`
`102`	`102`	`* @since 5.2.0`
`103`	`103`	`*`
`104`		`- * @param string $token Recovery Mode token created by {@see generate_recovery_mode_token()}.`
`105`		`- * @param string $key Recovery Mode key created by {@see generate_and_store_recovery_mode_key()}.`
	`104`	`+ * @param string $token Recovery Mode token created by {@see WP_Recovery_Mode_Key_Service::generate_recovery_mode_token()}.`
	`105`	`+ * @param string $key Recovery Mode key created by {@see WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key()}.`
`106`	`106`	`* @return string Recovery mode begin URL.`
`107`	`107`	`*/`
`108`	`108`	`private function get_recovery_mode_begin_url( $token, $key ) {`