From 246447872e76daab5ee4307a68277144a1d68aa7 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 2 Nov 2021 13:26:48 -0400 Subject: [PATCH 1/2] Code Modernization: Avoid passing null to parameter 2 of `http_build_query()` This fixes the "Deprecated: http_build_query(): Passing null to parameter #2 ($numeric_prefix) of type string is deprecated" warning on PHP 8.1. PHP has started requiring that built-in method arguments that are not explicitly declared as nullable may no longer be passed null. The correct value for the `$numeric_prefix` parameter to `http_build_query()` is an empty string. Trac ticket: https://core.trac.wordpress.org/ticket/53635 --- src/wp-admin/includes/update.php | 2 +- src/wp-includes/Requests/Transport/cURL.php | 2 +- src/wp-includes/update.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/update.php b/src/wp-admin/includes/update.php index 29a5f0c783878..03cd1f2bcd263 100644 --- a/src/wp-admin/includes/update.php +++ b/src/wp-admin/includes/update.php @@ -120,7 +120,7 @@ function find_core_auto_update() { * @return array|false An array of checksums on success, false on failure. */ function get_core_checksums( $version, $locale ) { - $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' ); + $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' ); $url = $http_url; $ssl = wp_http_supports( array( 'ssl' ) ); diff --git a/src/wp-includes/Requests/Transport/cURL.php b/src/wp-includes/Requests/Transport/cURL.php index 01bcf3b719f1c..715d6c0c147a7 100644 --- a/src/wp-includes/Requests/Transport/cURL.php +++ b/src/wp-includes/Requests/Transport/cURL.php @@ -342,7 +342,7 @@ protected function setup_handle($url, $headers, $data, $options) { $data = ''; } elseif (!is_string($data)) { - $data = http_build_query($data, null, '&'); + $data = http_build_query($data, '', '&'); } } diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php index 85d0d4c9a86d0..42ae3ecf3afc1 100644 --- a/src/wp-includes/update.php +++ b/src/wp-includes/update.php @@ -143,7 +143,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { $query['channel'] = WP_AUTO_UPDATE_CORE; } - $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' ); + $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, '', '&' ); $http_url = $url; $ssl = wp_http_supports( array( 'ssl' ) ); From a1f2603eba6e445176589b9b8b32b23d2bd3d789 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 2 Nov 2021 15:08:02 -0400 Subject: [PATCH 2/2] Un-fix something that's apparently a copied library --- src/wp-includes/Requests/Transport/cURL.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/Requests/Transport/cURL.php b/src/wp-includes/Requests/Transport/cURL.php index 715d6c0c147a7..01bcf3b719f1c 100644 --- a/src/wp-includes/Requests/Transport/cURL.php +++ b/src/wp-includes/Requests/Transport/cURL.php @@ -342,7 +342,7 @@ protected function setup_handle($url, $headers, $data, $options) { $data = ''; } elseif (!is_string($data)) { - $data = http_build_query($data, '', '&'); + $data = http_build_query($data, null, '&'); } }