Skip to content

Commit

Permalink
Code Modernization: Pass correct default value to `http_build_query()…
Browse files Browse the repository at this point in the history
…` in `WP_Sitemaps_Provider::get_sitemap_url()`.

The `WP_Sitemaps_Provider::get_sitemap_url()` method calls the PHP native `http_build_query()` function, the second parameter of which is the ''optional'' `$numeric_prefix` parameter which expects a `string`.

A parameter being optional, however, does not automatically make it nullable.

As of PHP 8.1, passing `null` to a non-nullable PHP native function will generate a deprecation notice.

In this case, this function call yielded a `http_build_query(): Passing null to parameter #2 ($numeric_prefix) of type string is deprecated` notice.

Changing the `null` to an empty string fixes this without a backward compatibility break.

This change is already covered by tests as 14 of the existing tests failed on these function calls when running the tests on PHP 8.1.

References:
* [https://www.php.net/manual/en/function.http-build-query.php PHP Manual: http_build_query()]
* [https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg PHP RFC: Deprecate passing null to non-nullable arguments of internal functions]

Follow-up to [48470].

Props jrf.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51652 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
SergeyBiryukov committed Aug 23, 2021
1 parent 402e2e6 commit d4abd5c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function get_sitemap_url( $name, $page ) {
);

if ( ! $wp_rewrite->using_permalinks() ) {
$basename = '/?' . http_build_query( $params, null, '&' );
$basename = '/?' . http_build_query( $params, '', '&' );
}

return home_url( $basename );
Expand Down

0 comments on commit d4abd5c

Please sign in to comment.