From 9134afa22012e3015209299ec58274bbb5964833 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 26 Apr 2022 14:59:08 +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.
Built from https://develop.svn.wordpress.org/trunk@53284


git-svn-id: http://core.svn.wordpress.org/trunk@52873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentytwenty/inc/custom-css.php    |  2 +-
 wp-content/themes/twentytwentyone/inc/custom-css.php |  2 +-
 wp-includes/class.wp-styles.php                      | 12 ++++++------
 wp-includes/version.php                              |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-content/themes/twentytwenty/inc/custom-css.php b/wp-content/themes/twentytwenty/inc/custom-css.php
index a1dbb773f0..815f5d1b72 100644
--- a/wp-content/themes/twentytwenty/inc/custom-css.php
+++ b/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/wp-content/themes/twentytwentyone/inc/custom-css.php b/wp-content/themes/twentytwentyone/inc/custom-css.php
index c0244d20f3..6212d15c88 100644
--- a/wp-content/themes/twentytwentyone/inc/custom-css.php
+++ b/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/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 91e14aeffc..88c04eed8a 100644
--- a/wp-includes/class.wp-styles.php
+++ b/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;
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ecd931ac3e..3ecaa50956 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-beta2-53283';
+$wp_version = '6.0-beta2-53284';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.