Merge branch 'trunk' into add/isset-checks

Author: westonruter

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/collaboration/class-wp-sync-post-meta-storage.php

@@ -85,7 +85,7 @@ public function add_update( string $room, $update ): bool {
 			'value'     => $update,
 		);
 
-		return (bool) add_post_meta( $post_id, self::SYNC_UPDATE_META_KEY, $envelope, false );
+		return (bool) add_post_meta( $post_id, wp_slash( self::SYNC_UPDATE_META_KEY ), wp_slash( $envelope ), false );
 	}
 
 	/**
@@ -162,7 +162,7 @@ public function set_awareness_state( string $room, array $awareness ): bool {
 		}
 
 		// update_post_meta returns false if the value is the same as the existing value.
-		update_post_meta( $post_id, self::AWARENESS_META_KEY, $awareness );
+		update_post_meta( $post_id, wp_slash( self::AWARENESS_META_KEY ), wp_slash( $awareness ) );
 		return true;
 	}
 
@@ -305,7 +305,7 @@ public function remove_updates_before_cursor( string $room, int $cursor ): bool
 		$all_updates = $this->get_all_updates( $room );
 
 		// Remove all updates for the room and re-store only those that are newer than the cursor.
-		if ( ! delete_post_meta( $post_id, self::SYNC_UPDATE_META_KEY ) ) {
+		if ( ! delete_post_meta( $post_id, wp_slash( self::SYNC_UPDATE_META_KEY ) ) ) {
 			return false;
 		}
 

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

@@ -225,6 +225,9 @@ for path in "${REMOVE_PATHS[@]}"; do
 	rm -rf "$TARGET_DIR/third-party/$path"
 done
 
+# Remove polyfills.php — WordPress Core already provides these functions in compat.php.
+rm -f "$TARGET_DIR/src/polyfills.php"
+
 # ---------------------------------------------------------------------------
 # Generate autoload.php
 # ---------------------------------------------------------------------------