Eliminate null value for wp_ai_client_default_request_timeout filter

Author: westonruter

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

@@ -197,20 +197,17 @@ public function __construct( ProviderRegistry $registry, $prompt = null ) {
 		 *
 		 * @since 7.0.0
 		 *
-		 * @param float|null $default_timeout The default timeout in seconds, or null to disable the timeout.
-		 *                                    If not null, must be greater than or equal to zero.
+		 * @param float $default_timeout The default timeout in seconds.
 		 */
 		$timeout = apply_filters( 'wp_ai_client_default_request_timeout', $default_timeout );
 		if ( is_numeric( $timeout ) && (float) $timeout >= 0.0 ) {
 			$default_timeout = (float) $timeout;
-		} elseif ( null === $timeout ) {
-			$default_timeout = null;
 		} else {
 			_doing_it_wrong(
 				__METHOD__,
 				sprintf(
 					/* translators: %s: wp_ai_client_default_request_timeout */
-					__( 'The %s filter must return a non-negative number or null.' ),
+					__( 'The %s filter must return a non-negative number.' ),
 					'<code>wp_ai_client_default_request_timeout</code>'
 				),
 				'7.0.0'

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

@@ -214,23 +214,6 @@ static function () {
 		$this->assertSame( 45.5, $request_options->getTimeout() );
 	}
 
-	/**
-	 * Test that the constructor allows overriding the default request timeout with null.
-	 *
-	 * @ticket 65094
-	 */
-	public function test_constructor_allows_overriding_request_timeout_with_null() {
-		add_filter( 'wp_ai_client_default_request_timeout', '__return_null' );
-
-		$builder = new WP_AI_Client_Prompt_Builder( AiClient::defaultRegistry() );
-
-		/** @var RequestOptions $request_options */
-		$request_options = $this->get_wrapped_prompt_builder_property_value( $builder, 'requestOptions' );
-
-		$this->assertInstanceOf( RequestOptions::class, $request_options );
-		$this->assertNull( $request_options->getTimeout() );
-	}
-
 	/**
 	 * Test that the constructor disallows overriding the default request timeout with an invalid value.
 	 *
@@ -256,7 +239,7 @@ static function () use ( $timeout ) {
 		$request_options = $this->get_wrapped_prompt_builder_property_value( $builder, 'requestOptions' );
 
 		$this->assertInstanceOf( RequestOptions::class, $request_options );
-		$this->assertSame( 30, $request_options->getTimeout() );
+		$this->assertSame( 30.0, $request_options->getTimeout() );
 	}
 
 	/**
@@ -268,6 +251,7 @@ public function data_invalid_request_timeouts(): array {
 		return array(
 			'negative number' => array( -1 ),
 			'array'           => array( array() ),
+			'null'            => array( null ),
 		);
 	}