From 74567338b892094c5e5c2ee3f7eaab45261480ff Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 24 Jan 2023 14:42:17 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/blocks.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 `$default` parameter to `$default_value` in `block_has_support()`. 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], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037], [55038], [55039], [55049], [55050], [55060], [55062], [55064], [55065], [55076], [55077], [55078], [55081], [55090], [55100], [55104], [55112], [55115], [55116], [55117], [55119], [55120]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. Built from https://develop.svn.wordpress.org/trunk@55126 git-svn-id: http://core.svn.wordpress.org/trunk@54659 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks.php | 12 ++++++------ wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php index 29e375ab89..8962680c53 100644 --- a/wp-includes/blocks.php +++ b/wp-includes/blocks.php @@ -1167,15 +1167,15 @@ function unregister_block_style( $block_name, $block_style_name ) { * * @since 5.8.0 * - * @param WP_Block_Type $block_type Block type to check for support. - * @param array $feature Path to a specific feature to check support for. - * @param mixed $default Optional. Fallback value for feature support. Default false. + * @param WP_Block_Type $block_type Block type to check for support. + * @param array $feature Path to a specific feature to check support for. + * @param mixed $default_value Optional. Fallback value for feature support. Default false. * @return bool Whether the feature is supported. */ -function block_has_support( $block_type, $feature, $default = false ) { - $block_support = $default; +function block_has_support( $block_type, $feature, $default_value = false ) { + $block_support = $default_value; if ( $block_type && property_exists( $block_type, 'supports' ) ) { - $block_support = _wp_array_get( $block_type->supports, $feature, $default ); + $block_support = _wp_array_get( $block_type->supports, $feature, $default_value ); } return true === $block_support || is_array( $block_support ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 740fdaaf25..2a7cf81a8e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-55125'; +$wp_version = '6.2-alpha-55126'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.