Merge branch 'WordPress:trunk' into trunk

dd32 · web-flow · commit bf27598e90d8 · 2026-07-19T09:30:44.000+10:00
diff --git a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
@@ -273,7 +273,7 @@ private function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' )
 		add_filter(
 			'pre_http_request',
 			static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {
-				if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
+				if ( wp_parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
 					return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );
 
 				}
diff --git a/tests/phpunit/tests/rest-api/rest-plugins-controller.php b/tests/phpunit/tests/rest-api/rest-plugins-controller.php
@@ -1167,7 +1167,7 @@ private function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' )
 		add_filter(
 			'pre_http_request',
 			static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {
-				if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
+				if ( wp_parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
 					return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );
 
 				}

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ private function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' )`
`273`	`273`	`add_filter(`
`274`	`274`	`'pre_http_request',`
`275`	`275`	`static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {`
`276`		`- if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {`
	`276`	`+ if ( wp_parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {`
`277`	`277`	`return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );`
`278`	`278`
`279`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ private function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' )`
`1167`	`1167`	`add_filter(`
`1168`	`1168`	`'pre_http_request',`
`1169`	`1169`	`static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {`
`1170`		`- if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {`
	`1170`	`+ if ( wp_parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {`
`1171`	`1171`	`return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );`
`1172`	`1172`
`1173`	`1173`	`}`