Merge branch 'trunk' into html-api/ignore-internal-methods-from-docs

sirreal · web-flow · commit 597db47e5e14 · 2026-03-03T09:57:50.000+01: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/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/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
@@ -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 */
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -493,7 +493,7 @@ public function column_title( $post ) {
 				'<a href="%s">',
 				get_edit_post_link( $post->ID ),
 			);
-			$link_end = '</a>';
+			$link_end   = '</a>';
 		}
 
 		$class = $thumb ? ' class="has-media-icon"' : '';
diff --git a/src/wp-includes/ai-client/class-wp-ai-client-prompt-builder.php b/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.
diff --git a/src/wp-includes/author-template.php b/src/wp-includes/author-template.php
@@ -334,7 +334,7 @@ function get_the_author_posts_link() {
 
 	$author = get_the_author();
 	/* translators: %s: Author's display name. */
-	$title  = sprintf( __( 'Posts by %s' ), $author );
+	$title = sprintf( __( 'Posts by %s' ), $author );
 
 	$link = sprintf(
 		'<a href="%1$s" rel="author">%2$s</a>',
diff --git a/src/wp-includes/class-wp-comment.php b/src/wp-includes/class-wp-comment.php
@@ -210,7 +210,7 @@ public static function get_instance( $id ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param WP_Comment $comment Comment object.
+	 * @param object $comment Comment object.
 	 */
 	public function __construct( $comment ) {
 		foreach ( get_object_vars( $comment ) as $key => $value ) {
diff --git a/src/wp-includes/class-wp-post.php b/src/wp-includes/class-wp-post.php
@@ -260,7 +260,7 @@ public static function get_instance( $post_id ) {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @param WP_Post|object $post Post object.
+	 * @param object $post Post object.
 	 */
 	public function __construct( $post ) {
 		foreach ( get_object_vars( $post ) as $key => $value ) {
diff --git a/src/wp-includes/class-wp-site.php b/src/wp-includes/class-wp-site.php
@@ -190,7 +190,7 @@ public static function get_instance( $site_id ) {
 	 *
 	 * @since 4.5.0
 	 *
-	 * @param WP_Site|object $site A site object.
+	 * @param object $site A site object.
 	 */
 	public function __construct( $site ) {
 		foreach ( get_object_vars( $site ) as $key => $value ) {
diff --git a/src/wp-includes/class-wp-term.php b/src/wp-includes/class-wp-term.php
@@ -192,7 +192,7 @@ public static function get_instance( $term_id, $taxonomy = null ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param WP_Term|object $term Term object.
+	 * @param object $term Term object.
 	 */
 	public function __construct( $term ) {
 		foreach ( get_object_vars( $term ) as $key => $value ) {
diff --git a/src/wp-includes/class-wp-user.php b/src/wp-includes/class-wp-user.php
@@ -121,9 +121,9 @@ class WP_User {
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int|string|stdClass|WP_User $id      User's ID, a WP_User object, or a user object from the DB.
-	 * @param string                      $name    Optional. User's username
-	 * @param int                         $site_id Optional Site ID, defaults to current site.
+	 * @param int|string|object $id      User's ID, a WP_User object, or a user object from the DB.
+	 * @param string            $name    Optional. User's username
+	 * @param int               $site_id Optional Site ID, defaults to current site.
 	 */
 	public function __construct( $id = 0, $name = '', $site_id = 0 ) {
 		global $wpdb;
diff --git a/src/wp-includes/collaboration/class-wp-sync-post-meta-storage.php b/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;
 		}
 
diff --git a/src/wp-includes/php-ai-client/src/polyfills.php b/src/wp-includes/php-ai-client/src/polyfills.php
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
@@ -1135,7 +1135,7 @@ function get_extended( $post ) {
  *
  * @global WP_Post $post Global post object.
  *
- * @param int|WP_Post|null $post   Optional. Post ID or post object. `null`, `false`, `0` and other PHP falsey values
+ * @param int|object|null  $post   Optional. Post ID or post object. `null`, `false`, `0` and other PHP falsey values
  *                                 return the current global post inside the loop. A numerically valid post ID that
  *                                 points to a non-existent post returns `null`. Defaults to global $post.
  * @param string           $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
@@ -1159,8 +1159,10 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
 			$_post = new WP_Post( $_post );
 		} elseif ( 'raw' === $post->filter ) {
 			$_post = new WP_Post( $post );
-		} else {
+		} elseif ( isset( $post->ID ) ) {
 			$_post = WP_Post::get_instance( $post->ID );
+		} else {
+			$_post = null;
 		}
 	} else {
 		$_post = WP_Post::get_instance( $post );
diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -1391,9 +1391,9 @@ public function get_index( $request ) {
 			/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 			$available['jpeg_interlaced'] = (bool) apply_filters( 'image_save_progressive', false, 'image/jpeg' );
 			/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
-			$available['png_interlaced']  = (bool) apply_filters( 'image_save_progressive', false, 'image/png' );
+			$available['png_interlaced'] = (bool) apply_filters( 'image_save_progressive', false, 'image/png' );
 			/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
-			$available['gif_interlaced']  = (bool) apply_filters( 'image_save_progressive', false, 'image/gif' );
+			$available['gif_interlaced'] = (bool) apply_filters( 'image_save_progressive', false, 'image/gif' );
 		}
 
 		$response = new WP_REST_Response( $available );
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
@@ -1723,7 +1723,7 @@ function sanitize_term( $term, $taxonomy, $context = 'display' ) {
 
 	$do_object = is_object( $term );
 
-	$term_id = $do_object ? $term->term_id : ( $term['term_id'] ?? 0 );
+	$term_id = $do_object ? ( $term->term_id ?? 0 ) : ( $term['term_id'] ?? 0 );
 
 	foreach ( (array) $fields as $field ) {
 		if ( $do_object ) {
diff --git a/tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php b/tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.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() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/post/getPost.php b/tests/phpunit/tests/post/getPost.php
diff --git a/tests/phpunit/tests/term/sanitizeTerm.php b/tests/phpunit/tests/term/sanitizeTerm.php
diff --git a/tests/qunit/wp-includes/js/wp-sanitize.js b/tests/qunit/wp-includes/js/wp-sanitize.js
diff --git a/tools/php-ai-client/installer.sh b/tools/php-ai-client/installer.sh

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
`@@ -1194,7 +1194,7 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`	`1196`	`#bulk-titles .ntdelbutton:focus {`
`1197`		`- box-shadow: 0 0 0 2px #3582c4;`
	`1197`	`+ box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);`
`1198`	`1198`	`/* Only visible in Windows High Contrast mode */`
`1199`	`1199`	`outline: 2px solid transparent;`
`1200`	`1200`	`/* Reset inherited offset from Gutenberg */`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public function column_title( $post ) {`
`493`	`493`	`'<a href="%s">',`
`494`	`494`	`get_edit_post_link( $post->ID ),`
`495`	`495`	`);`
`496`		`- $link_end = '</a>';`
	`496`	`+ $link_end = '</a>';`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`$class = $thumb ? ' class="has-media-icon"' : '';`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public static function get_instance( $id ) {`
`210`	`210`	`*`
`211`	`211`	`* @since 4.4.0`
`212`	`212`	`*`
`213`		`- * @param WP_Comment $comment Comment object.`
	`213`	`+ * @param object $comment Comment object.`
`214`	`214`	`*/`
`215`	`215`	`public function __construct( $comment ) {`
`216`	`216`	`foreach ( get_object_vars( $comment ) as $key => $value ) {`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public static function get_instance( $post_id ) {`
`260`	`260`	`*`
`261`	`261`	`* @since 3.5.0`
`262`	`262`	`*`
`263`		`- * @param WP_Post\|object $post Post object.`
	`263`	`+ * @param object $post Post object.`
`264`	`264`	`*/`
`265`	`265`	`public function __construct( $post ) {`
`266`	`266`	`foreach ( get_object_vars( $post ) as $key => $value ) {`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public static function get_instance( $site_id ) {`
`190`	`190`	`*`
`191`	`191`	`* @since 4.5.0`
`192`	`192`	`*`
`193`		`- * @param WP_Site\|object $site A site object.`
	`193`	`+ * @param object $site A site object.`
`194`	`194`	`*/`
`195`	`195`	`public function __construct( $site ) {`
`196`	`196`	`foreach ( get_object_vars( $site ) as $key => $value ) {`