From b1f7eb6e1e5fae99091fb999de10adfe0fa87973 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 16 Dec 2022 10:43:16 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/sitemaps/class-wp-sitemaps.php`. While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit renames the `$public` parameter to `$is_public` in `WP_Sitemaps::add_robots()`. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. Built from https://develop.svn.wordpress.org/trunk@55000 git-svn-id: http://core.svn.wordpress.org/trunk@54533 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/sitemaps/class-wp-sitemaps.php | 8 ++++---- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/sitemaps/class-wp-sitemaps.php b/wp-includes/sitemaps/class-wp-sitemaps.php index 85d3adddb4..d897fa8f2a 100644 --- a/wp-includes/sitemaps/class-wp-sitemaps.php +++ b/wp-includes/sitemaps/class-wp-sitemaps.php @@ -250,12 +250,12 @@ class WP_Sitemaps { * * @since 5.5.0 * - * @param string $output robots.txt output. - * @param bool $public Whether the site is public. + * @param string $output robots.txt output. + * @param bool $is_public Whether the site is public. * @return string The robots.txt output. */ - public function add_robots( $output, $public ) { - if ( $public ) { + public function add_robots( $output, $is_public ) { + if ( $is_public ) { $output .= "\nSitemap: " . esc_url( $this->index->get_index_url() ) . "\n"; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 0a5477621e..65693afab4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54999'; +$wp_version = '6.2-alpha-55000'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.