From e86772db783f1997870ea143f87f447726fa1b45 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 26 Apr 2022 14:57:41 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class.wp-styles.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 `$echo` parameter to `$display` in `WP_Styles` class methods. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. git-svn-id: https://develop.svn.wordpress.org/trunk@53284 602fd350-edb4-49c9-b593-d223f7449a82 --- .../themes/twentytwenty/inc/custom-css.php | 2 +- .../themes/twentytwentyone/inc/custom-css.php | 2 +- src/wp-includes/class.wp-styles.php | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wp-content/themes/twentytwenty/inc/custom-css.php b/src/wp-content/themes/twentytwenty/inc/custom-css.php index a1dbb773f0..815f5d1b72 100644 --- a/src/wp-content/themes/twentytwenty/inc/custom-css.php +++ b/src/wp-content/themes/twentytwenty/inc/custom-css.php @@ -19,7 +19,7 @@ if ( ! function_exists( 'twentytwenty_generate_css' ) ) { * @param string $value The CSS value. * @param string $prefix The CSS prefix. * @param string $suffix The CSS suffix. - * @param bool $display Output the styles. + * @param bool $display Print the styles. */ function twentytwenty_generate_css( $selector, $style, $value, $prefix = '', $suffix = '', $display = true ) { diff --git a/src/wp-content/themes/twentytwentyone/inc/custom-css.php b/src/wp-content/themes/twentytwentyone/inc/custom-css.php index c0244d20f3..6212d15c88 100644 --- a/src/wp-content/themes/twentytwentyone/inc/custom-css.php +++ b/src/wp-content/themes/twentytwentyone/inc/custom-css.php @@ -17,7 +17,7 @@ * @param string $value The CSS value. * @param string $prefix The CSS prefix. * @param string $suffix The CSS suffix. - * @param bool $display Output the styles. + * @param bool $display Print the styles. * @return string */ function twenty_twenty_one_generate_css( $selector, $style, $value, $prefix = '', $suffix = '', $display = true ) { diff --git a/src/wp-includes/class.wp-styles.php b/src/wp-includes/class.wp-styles.php index 91e14aeffc..88c04eed8a 100644 --- a/src/wp-includes/class.wp-styles.php +++ b/src/wp-includes/class.wp-styles.php @@ -324,13 +324,13 @@ class WP_Styles extends WP_Dependencies { * * @since 3.3.0 * - * @param string $handle The style's registered handle. - * @param bool $echo Optional. Whether to echo the inline style - * instead of just returning it. Default true. - * @return string|bool False if no data exists, inline styles if `$echo` is true, + * @param string $handle The style's registered handle. + * @param bool $display Optional. Whether to print the inline style + * instead of just returning it. Default true. + * @return string|bool False if no data exists, inline styles if `$display` is true, * true otherwise. */ - public function print_inline_style( $handle, $echo = true ) { + public function print_inline_style( $handle, $display = true ) { $output = $this->get_data( $handle, 'after' ); if ( empty( $output ) ) { @@ -339,7 +339,7 @@ class WP_Styles extends WP_Dependencies { $output = implode( "\n", $output ); - if ( ! $echo ) { + if ( ! $display ) { return $output; }