Changeset 53284

Timestamp:

04/26/2022 02:57:41 PM (2 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src

Files:

• wp-content/themes/twentytwenty/inc/custom-css.php (modified) (1 diff)
• wp-content/themes/twentytwentyone/inc/custom-css.php (modified) (1 diff)
• wp-includes/class.wp-styles.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php

@@ -20 +20 @@
      * @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 ) {

trunk/src/wp-content/themes/twentytwentyone/inc/custom-css.php

@@ -18 +18 @@
  * @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
  */

trunk/src/wp-includes/class.wp-styles.php

@@ -325 +325 @@
      * @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' );
 
@@ -340 +340 @@
         $output = implode( "\n", $output );
 
-        if ( ! $echo ) {
+        if ( ! $display ) {
             return $output;
         }