Merge branch 'trunk' into add-scaled-to-sideload-route

Author: adamsilverstein

src/js/_enqueues/wp/sanitize.js

@@ -23,7 +23,7 @@
 		 * @return {string} Stripped text.
 		 */
 		stripTags: function( text ) {
-			if ( ! text ) {
+			if ( 'string' !== typeof text ) {
 				return '';
 			}
 

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;
 }

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 {

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. */

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

@@ -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 */

src/wp-includes/ai-client/class-wp-ai-client-prompt-builder.php

@@ -165,7 +165,18 @@ class WP_AI_Client_Prompt_Builder {
 	 *                                                                                                    conversations. Default null.
 	 */
 	public function __construct( ProviderRegistry $registry, $prompt = null ) {
-		$this->builder = new PromptBuilder( $registry, $prompt );
+		try {
+			$this->builder = new PromptBuilder( $registry, $prompt );
+		} catch ( Exception $e ) {
+			$this->builder = new PromptBuilder( $registry );
+			$this->error   = new WP_Error(
+				'prompt_builder_error',
+				$e->getMessage(),
+				array(
+					'exception_class' => get_class( $e ),
+				)
+			);
+		}
 
 		/**
 		 * Filters the default request timeout in seconds for AI Client HTTP requests.

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 );

src/wp-includes/php-ai-client/src/polyfills.php

@@ -1347,22 +1347,15 @@ public function test_validate_messages_non_user_last_returns_wp_error() {
 	/**
 	 * Tests parseMessage with empty string returns WP_Error on termination.
 	 *
-	 * The SDK constructor throws immediately for empty strings, so the exception
-	 * is caught in the constructor and stored.
-	 *
 	 * @ticket 64591
 	 */
 	public function test_parse_message_empty_string_returns_wp_error() {
-		// The empty string exception is thrown by the SDK's PromptBuilder constructor,
-		// which happens before our __call() error handling. We must catch it manually.
-		try {
-			$builder = new WP_AI_Client_Prompt_Builder( $this->registry, '   ' );
-			// If we get here, the SDK didn't throw. Test would need adjusting.
-			$result = $builder->generate_result();
-			$this->assertWPError( $result );
-		} catch ( InvalidArgumentException $e ) {
-			$this->assertStringContainsString( 'Cannot create a message from an empty string', $e->getMessage() );
-		}
+		$builder = new WP_AI_Client_Prompt_Builder( $this->registry, '   ' );
+		$result  = $builder->generate_result();
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
+		$this->assertStringContainsString( 'Cannot create a message from an empty string', $result->get_error_message() );
 	}
 
 	/**
@@ -1371,13 +1364,12 @@ public function test_parse_message_empty_string_returns_wp_error() {
 	 * @ticket 64591
 	 */
 	public function test_parse_message_empty_array_returns_wp_error() {
-		try {
-			$builder = new WP_AI_Client_Prompt_Builder( $this->registry, array() );
-			$result  = $builder->generate_result();
-			$this->assertWPError( $result );
-		} catch ( InvalidArgumentException $e ) {
-			$this->assertStringContainsString( 'Cannot create a message from an empty array', $e->getMessage() );
-		}
+		$builder = new WP_AI_Client_Prompt_Builder( $this->registry, array() );
+		$result  = $builder->generate_result();
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
+		$this->assertStringContainsString( 'Cannot create a message from an empty array', $result->get_error_message() );
 	}
 
 	/**
@@ -1386,13 +1378,31 @@ public function test_parse_message_empty_array_returns_wp_error() {
 	 * @ticket 64591
 	 */
 	public function test_parse_message_invalid_type_returns_wp_error() {
-		try {
-			$builder = new WP_AI_Client_Prompt_Builder( $this->registry, 123 );
-			$result  = $builder->generate_result();
-			$this->assertWPError( $result );
-		} catch ( InvalidArgumentException $e ) {
-			$this->assertStringContainsString( 'Input must be a string, MessagePart, MessagePartArrayShape', $e->getMessage() );
-		}
+		$builder = new WP_AI_Client_Prompt_Builder( $this->registry, 123 );
+		$result  = $builder->generate_result();
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
+		$this->assertStringContainsString( 'Input must be a string, MessagePart, MessagePartArrayShape', $result->get_error_message() );
+	}
+
+	/**
+	 * Tests that wp_ai_client_prompt() with an empty string does not throw.
+	 *
+	 * Constructor exceptions are caught and surfaced as WP_Error from
+	 * generating methods, consistent with the __call() wrapping behavior.
+	 *
+	 * @ticket 64591
+	 */
+	public function test_wp_ai_client_prompt_empty_string_returns_wp_error() {
+		$builder = wp_ai_client_prompt( '   ' );
+
+		$this->assertInstanceOf( WP_AI_Client_Prompt_Builder::class, $builder );
+
+		$result = $builder->generate_text();
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
 	}
 
 	/**

tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php

@@ -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 ) {