diff --git a/src/wp-admin/includes/class-automatic-upgrader-skin.php b/src/wp-admin/includes/class-automatic-upgrader-skin.php index 686f95dd84..15ea79f5f4 100644 --- a/src/wp-admin/includes/class-automatic-upgrader-skin.php +++ b/src/wp-admin/includes/class-automatic-upgrader-skin.php @@ -66,18 +66,20 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { * Stores a message about the upgrade. * * @since 3.7.0 + * @since 5.9.0 Renamed `$data` to `$feedback` for PHP 8 named parameter support. * - * @param string|array|WP_Error $data Message data. - * @param mixed ...$args Optional text replacements. + * @param string|array|WP_Error $feedback Message data. + * @param mixed ...$args Optional text replacements. */ - public function feedback( $data, ...$args ) { - if ( is_wp_error( $data ) ) { - $string = $data->get_error_message(); - } elseif ( is_array( $data ) ) { + public function feedback( $feedback, ...$args ) { + if ( is_wp_error( $feedback ) ) { + $string = $feedback->get_error_message(); + } elseif ( is_array( $feedback ) ) { return; } else { - $string = $data; + $string = $feedback; } + if ( ! empty( $this->upgrader->strings[ $string ] ) ) { $string = $this->upgrader->strings[ $string ]; } diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php index c5cbcd487e..d09b0e9fcc 100644 --- a/src/wp-admin/includes/class-bulk-upgrader-skin.php +++ b/src/wp-admin/includes/class-bulk-upgrader-skin.php @@ -49,28 +49,30 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { } /** - * @param string $string - * @param mixed ...$args Optional text replacements. + * @since 5.9.0 Renamed `$string` (a PHP reserved keyword) to `$feedback` for PHP 8 named parameter support. + * + * @param string $feedback Message data. + * @param mixed ...$args Optional text replacements. */ - public function feedback( $string, ...$args ) { - if ( isset( $this->upgrader->strings[ $string ] ) ) { - $string = $this->upgrader->strings[ $string ]; + public function feedback( $feedback, ...$args ) { + if ( isset( $this->upgrader->strings[ $feedback ] ) ) { + $feedback = $this->upgrader->strings[ $feedback ]; } - if ( strpos( $string, '%' ) !== false ) { + if ( strpos( $feedback, '%' ) !== false ) { if ( $args ) { - $args = array_map( 'strip_tags', $args ); - $args = array_map( 'esc_html', $args ); - $string = vsprintf( $string, $args ); + $args = array_map( 'strip_tags', $args ); + $args = array_map( 'esc_html', $args ); + $feedback = vsprintf( $feedback, $args ); } } - if ( empty( $string ) ) { + if ( empty( $feedback ) ) { return; } if ( $this->in_loop ) { - echo "$string<br />\n"; + echo "$feedback<br />\n"; } else { - echo "<p>$string</p>\n"; + echo "<p>$feedback</p>\n"; } } diff --git a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php index 27d8beb740..bb5a961251 100644 --- a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php +++ b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php @@ -121,17 +121,18 @@ class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { * @since 4.6.0 * @since 5.3.0 Formalized the existing `...$args` parameter by adding it * to the function signature. + * @since 5.9.0 Renamed `$data` to `$feedback` for PHP 8 named parameter support. * - * @param string|array|WP_Error $data Message data. - * @param mixed ...$args Optional text replacements. + * @param string|array|WP_Error $feedback Message data. + * @param mixed ...$args Optional text replacements. */ - public function feedback( $data, ...$args ) { - if ( is_wp_error( $data ) ) { - foreach ( $data->get_error_codes() as $error_code ) { - $this->errors->add( $error_code, $data->get_error_message( $error_code ), $data->get_error_data( $error_code ) ); + public function feedback( $feedback, ...$args ) { + if ( is_wp_error( $feedback ) ) { + foreach ( $feedback->get_error_codes() as $error_code ) { + $this->errors->add( $error_code, $feedback->get_error_message( $error_code ), $feedback->get_error_data( $error_code ) ); } } - parent::feedback( $data, ...$args ); + parent::feedback( $feedback, ...$args ); } } diff --git a/src/wp-admin/includes/class-wp-upgrader-skin.php b/src/wp-admin/includes/class-wp-upgrader-skin.php index 33f083a3e7..40053df1bc 100644 --- a/src/wp-admin/includes/class-wp-upgrader-skin.php +++ b/src/wp-admin/includes/class-wp-upgrader-skin.php @@ -186,26 +186,27 @@ class WP_Upgrader_Skin { /** * @since 2.8.0 + * @since 5.9.0 Renamed `$string` (a PHP reserved keyword) to `$feedback` for PHP 8 named parameter support. * - * @param string $string - * @param mixed ...$args Optional text replacements. + * @param string $feedback Message data. + * @param mixed ...$args Optional text replacements. */ - public function feedback( $string, ...$args ) { - if ( isset( $this->upgrader->strings[ $string ] ) ) { - $string = $this->upgrader->strings[ $string ]; + public function feedback( $feedback, ...$args ) { + if ( isset( $this->upgrader->strings[ $feedback ] ) ) { + $feedback = $this->upgrader->strings[ $feedback ]; } - if ( strpos( $string, '%' ) !== false ) { + if ( strpos( $feedback, '%' ) !== false ) { if ( $args ) { - $args = array_map( 'strip_tags', $args ); - $args = array_map( 'esc_html', $args ); - $string = vsprintf( $string, $args ); + $args = array_map( 'strip_tags', $args ); + $args = array_map( 'esc_html', $args ); + $feedback = vsprintf( $feedback, $args ); } } - if ( empty( $string ) ) { + if ( empty( $feedback ) ) { return; } - show_message( $string ); + show_message( $feedback ); } /**