Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/ai-client/adapters/class-wp-ai-client-http-client.php

@@ -104,8 +104,9 @@ public function sendRequestWithOptions( RequestInterface $request, RequestOption
 
 		if ( is_wp_error( $response ) ) {
 			$message = sprintf(
-				/* translators: 1: Request URL. 2: Error message. */
-				__( 'Network error occurred while sending request to %1$s: %2$s' ),
+				/* translators: 1: HTTP method (e.g. GET, POST). 2: Request URL. 3: Error message. */
+				__( 'Network error occurred while sending %1$s request to %2$s: %3$s' ),
+				$request->getMethod(),
 				$url,
 				$response->get_error_message()
 			);

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

@@ -329,6 +329,32 @@ static function () {
 		$this->client->sendRequestWithOptions( $request, $options );
 	}
 
+	/**
+	 * Test that sendRequestWithOptions includes the HTTP method in the NetworkException message.
+	 *
+	 * @ticket 65421
+	 */
+	public function test_send_request_with_options_wp_error_message_includes_method() {
+		add_filter(
+			'pre_http_request',
+			static function () {
+				return new WP_Error( 'http_request_failed', 'Connection refused' );
+			}
+		);
+
+		$options = new WordPress\AiClient\Providers\Http\DTO\RequestOptions();
+		$request = $this->psr17_factory->createRequest( 'POST', 'https://api.example.com/generate' );
+
+		try {
+			$this->client->sendRequestWithOptions( $request, $options );
+			$this->fail( 'Expected NetworkException was not thrown.' );
+		} catch ( WordPress\AiClient\Providers\Http\Exception\NetworkException $e ) {
+			$this->assertStringContainsString( 'POST', $e->getMessage() );
+			$this->assertStringContainsString( 'https://api.example.com/generate', $e->getMessage() );
+			$this->assertStringContainsString( 'Connection refused', $e->getMessage() );
+		}
+	}
+
 	/**
 	 * Test seekable body is rewound before sending.
 	 *