WordPress.org
Get WordPress

Make WordPress Core

Changeset 61430


Ignore:
Timestamp:
01/05/2026 04:50:51 AM (8 months ago)
Author:
westonruter
Message:

Code Modernization: Block Supports: Use null coalescing operator instead of isset() ternaries.

Developed as a subset of ​https://github.com/WordPress/wordpress-develop/pull/10654
Initially developed in ​https://github.com/WordPress/wordpress-develop/pull/4886

Follow-up to [61429], [61424], [61404], [61403].

Props costdev, westonruter.
See #58874, #63430.

Location:
trunk/src/wp-includes/block-supports
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-includes/block-supports/border.php

    r56742 r61430  
    103103        ) {
    104104                $preset_border_color          = array_key_exists( 'borderColor', $block_attributes ) ? "var:preset|color|{$block_attributes['borderColor']}" : null;
    105                 $custom_border_color          = isset( $block_attributes['style']['border']['color'] ) ? $block_attributes['style']['border']['color'] : null;
     105                $custom_border_color          = $block_attributes['style']['border']['color'] ?? null;
    106106                $border_block_styles['color'] = $preset_border_color ? $preset_border_color : $custom_border_color;
    107107        }
    … …  
    110110        if ( $has_border_color_support || $has_border_width_support ) {
    111111                foreach ( array( 'top', 'right', 'bottom', 'left' ) as $side ) {
    112                         $border                       = isset( $block_attributes['style']['border'][ $side ] ) ? $block_attributes['style']['border'][ $side ] : null;
     112                        $border                       = $block_attributes['style']['border'][ $side ] ?? null;
    113113                        $border_side_values           = array(
    114114                                'width' => isset( $border['width'] ) && ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' ) ? $border['width'] : null,
    … …  
    154154        // Check if all border support features have been opted into via `"__experimentalBorder": true`.
    155155        if ( $block_type instanceof WP_Block_Type ) {
    156                 $block_type_supports_border = isset( $block_type->supports['__experimentalBorder'] )
    157                         ? $block_type->supports['__experimentalBorder']
    158                         : $default_value;
     156                $block_type_supports_border = $block_type->supports['__experimentalBorder'] ?? $default_value;
    159157                if ( true === $block_type_supports_border ) {
    160158                        return true;

  • trunk/src/wp-includes/block-supports/colors.php

    r56742 r61430  
    1919        $color_support = false;
    2020        if ( $block_type instanceof WP_Block_Type ) {
    21                 $color_support = isset( $block_type->supports['color'] ) ? $block_type->supports['color'] : false;
     21                $color_support = $block_type->supports['color'] ?? false;
    2222        }
    2323        $has_text_colors_support       = true === $color_support ||
    … …  
    2727                ( isset( $color_support['background'] ) && $color_support['background'] ) ||
    2828                ( is_array( $color_support ) && ! isset( $color_support['background'] ) );
    29         $has_gradients_support         = isset( $color_support['gradients'] ) ? $color_support['gradients'] : false;
    30         $has_link_colors_support       = isset( $color_support['link'] ) ? $color_support['link'] : false;
    31         $has_button_colors_support     = isset( $color_support['button'] ) ? $color_support['button'] : false;
    32         $has_heading_colors_support    = isset( $color_support['heading'] ) ? $color_support['heading'] : false;
     29        $has_gradients_support         = $color_support['gradients'] ?? false;
     30        $has_link_colors_support       = $color_support['link'] ?? false;
     31        $has_button_colors_support     = $color_support['button'] ?? false;
     32        $has_heading_colors_support    = $color_support['heading'] ?? false;
    3333        $has_color_support             = $has_text_colors_support ||
    3434                $has_background_colors_support ||
    … …  
    8282 */
    8383function wp_apply_colors_support( $block_type, $block_attributes ) {
    84         $color_support = isset( $block_type->supports['color'] ) ? $block_type->supports['color'] : false;
     84        $color_support = $block_type->supports['color'] ?? false;
    8585
    8686        if (
    … …  
    9797                ( isset( $color_support['background'] ) && $color_support['background'] ) ||
    9898                ( is_array( $color_support ) && ! isset( $color_support['background'] ) );
    99         $has_gradients_support         = isset( $color_support['gradients'] ) ? $color_support['gradients'] : false;
     99        $has_gradients_support         = $color_support['gradients'] ?? false;
    100100        $color_block_styles            = array();
    101101
    … …  
    103103        if ( $has_text_colors_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'text' ) ) {
    104104                $preset_text_color          = array_key_exists( 'textColor', $block_attributes ) ? "var:preset|color|{$block_attributes['textColor']}" : null;
    105                 $custom_text_color          = isset( $block_attributes['style']['color']['text'] ) ? $block_attributes['style']['color']['text'] : null;
     105                $custom_text_color          = $block_attributes['style']['color']['text'] ?? null;
    106106                $color_block_styles['text'] = $preset_text_color ? $preset_text_color : $custom_text_color;
    107107        }
    … …  
    110110        if ( $has_background_colors_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'background' ) ) {
    111111                $preset_background_color          = array_key_exists( 'backgroundColor', $block_attributes ) ? "var:preset|color|{$block_attributes['backgroundColor']}" : null;
    112                 $custom_background_color          = isset( $block_attributes['style']['color']['background'] ) ? $block_attributes['style']['color']['background'] : null;
     112                $custom_background_color          = $block_attributes['style']['color']['background'] ?? null;
    113113                $color_block_styles['background'] = $preset_background_color ? $preset_background_color : $custom_background_color;
    114114        }
    … …  
    117117        if ( $has_gradients_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'gradients' ) ) {
    118118                $preset_gradient_color          = array_key_exists( 'gradient', $block_attributes ) ? "var:preset|gradient|{$block_attributes['gradient']}" : null;
    119                 $custom_gradient_color          = isset( $block_attributes['style']['color']['gradient'] ) ? $block_attributes['style']['color']['gradient'] : null;
     119                $custom_gradient_color          = $block_attributes['style']['color']['gradient'] ?? null;
    120120                $color_block_styles['gradient'] = $preset_gradient_color ? $preset_gradient_color : $custom_gradient_color;
    121121        }

  • trunk/src/wp-includes/block-supports/dimensions.php

    r57491 r61430  
    6161
    6262        $has_min_height_support = block_has_support( $block_type, array( 'dimensions', 'minHeight' ), false );
    63         $block_styles           = isset( $block_attributes['style'] ) ? $block_attributes['style'] : null;
     63        $block_styles           = $block_attributes['style'] ?? null;
    6464
    6565        if ( ! $block_styles ) {
    … …  
    7171        $dimensions_block_styles['minHeight'] = null;
    7272        if ( $has_min_height_support && ! $skip_min_height ) {
    73                 $dimensions_block_styles['minHeight'] = isset( $block_styles['dimensions']['minHeight'] )
    74                         ? $block_styles['dimensions']['minHeight']
    75                         : null;
     73                $dimensions_block_styles['minHeight'] = $block_styles['dimensions']['minHeight'] ?? null;
    7674        }
    7775        $styles = wp_style_engine_get_styles( array( 'dimensions' => $dimensions_block_styles ) );

  • trunk/src/wp-includes/block-supports/elements.php

    r61270 r61430  
    3737        $element_color_properties = array(
    3838                'button'  => array(
    39                         'skip'  => isset( $options['button']['skip'] ) ? $options['button']['skip'] : false,
     39                        'skip'  => $options['button']['skip'] ?? false,
    4040                        'paths' => array(
    4141                                array( 'button', 'color', 'text' ),
    … …  
    4545                ),
    4646                'link'    => array(
    47                         'skip'  => isset( $options['link']['skip'] ) ? $options['link']['skip'] : false,
     47                        'skip'  => $options['link']['skip'] ?? false,
    4848                        'paths' => array(
    4949                                array( 'link', 'color', 'text' ),
    … …  
    5252                ),
    5353                'heading' => array(
    54                         'skip'  => isset( $options['heading']['skip'] ) ? $options['heading']['skip'] : false,
     54                        'skip'  => $options['heading']['skip'] ?? false,
    5555                        'paths' => array(
    5656                                array( 'heading', 'color', 'text' ),
    … …  
    131131
    132132        $block_type           = WP_Block_Type_Registry::get_instance()->get_registered( $parsed_block['blockName'] );
    133         $element_block_styles = isset( $parsed_block['attrs']['style']['elements'] ) ? $parsed_block['attrs']['style']['elements'] : null;
     133        $element_block_styles = $parsed_block['attrs']['style']['elements'] ?? null;
    134134
    135135        if ( ! $element_block_styles ) {
    … …  
    186186                }
    187187
    188                 $element_style_object = isset( $element_block_styles[ $element_type ] ) ? $element_block_styles[ $element_type ] : null;
     188                $element_style_object = $element_block_styles[ $element_type ] ?? null;
    189189
    190190                // Process primary element type styles.
    … …  
    212212                if ( isset( $element_config['elements'] ) ) {
    213213                        foreach ( $element_config['elements'] as $element ) {
    214                                 $element_style_object = isset( $element_block_styles[ $element ] )
    215                                         ? $element_block_styles[ $element ]
    216                                         : null;
     214                                $element_style_object = $element_block_styles[ $element ] ?? null;
    217215
    218216                                if ( $element_style_object ) {

  • trunk/src/wp-includes/block-supports/layout.php

    r60968 r61430  
    239239 */
    240240function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false, $gap_value = null, $should_skip_gap_serialization = false, $fallback_gap_value = '0.5em', $block_spacing = null ) {
    241         $layout_type   = isset( $layout['type'] ) ? $layout['type'] : 'default';
     241        $layout_type   = $layout['type'] ?? 'default';
    242242        $layout_styles = array();
    243243
    … …  
    245245                if ( $has_block_gap_support ) {
    246246                        if ( is_array( $gap_value ) ) {
    247                                 $gap_value = isset( $gap_value['top'] ) ? $gap_value['top'] : null;
     247                                $gap_value = $gap_value['top'] ?? null;
    248248                        }
    249249                        if ( null !== $gap_value && ! $should_skip_gap_serialization ) {
    … …  
    275275                }
    276276        } elseif ( 'constrained' === $layout_type ) {
    277                 $content_size    = isset( $layout['contentSize'] ) ? $layout['contentSize'] : '';
    278                 $wide_size       = isset( $layout['wideSize'] ) ? $layout['wideSize'] : '';
    279                 $justify_content = isset( $layout['justifyContent'] ) ? $layout['justifyContent'] : 'center';
     277                $content_size    = $layout['contentSize'] ?? '';
     278                $wide_size       = $layout['wideSize'] ?? '';
     279                $justify_content = $layout['justifyContent'] ?? 'center';
    280280
    281281                $all_max_width_value  = $content_size ? $content_size : $wide_size;
    … …  
    362362                if ( $has_block_gap_support ) {
    363363                        if ( is_array( $gap_value ) ) {
    364                                 $gap_value = isset( $gap_value['top'] ) ? $gap_value['top'] : null;
     364                                $gap_value = $gap_value['top'] ?? null;
    365365                        }
    366366                        if ( null !== $gap_value && ! $should_skip_gap_serialization ) {
    … …  
    392392                }
    393393        } elseif ( 'flex' === $layout_type ) {
    394                 $layout_orientation = isset( $layout['orientation'] ) ? $layout['orientation'] : 'horizontal';
     394                $layout_orientation = $layout['orientation'] ?? 'horizontal';
    395395
    396396                $justify_content_options = array(
    … …  
    428428                                $process_value = $gap_value;
    429429                                if ( is_array( $gap_value ) ) {
    430                                         $process_value = isset( $gap_value[ $gap_side ] ) ? $gap_value[ $gap_side ] : $fallback_gap_value;
     430                                        $process_value = $gap_value[ $gap_side ] ?? $fallback_gap_value;
    431431                                }
    432432                                // Get spacing CSS variable from preset value if provided.
    … …  
    515515                                $process_value = $gap_value;
    516516                                if ( is_array( $gap_value ) ) {
    517                                         $process_value = isset( $gap_value[ $gap_side ] ) ? $gap_value[ $gap_side ] : $fallback_gap_value;
     517                                        $process_value = $gap_value[ $gap_side ] ?? $fallback_gap_value;
    518518                                }
    519519                                // Get spacing CSS variable from preset value if provided.
    … …  
    571571        $block_type            = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
    572572        $block_supports_layout = block_has_support( $block_type, 'layout', false ) || block_has_support( $block_type, '__experimentalLayout', false );
    573         $child_layout          = isset( $block['attrs']['style']['layout'] ) ? $block['attrs']['style']['layout'] : null;
     573        $child_layout          = $block['attrs']['style']['layout'] ?? null;
    574574
    575575        if ( ! $block_supports_layout && ! $child_layout ) {
    … …  
    611611                $child_layout_styles       = array();
    612612
    613                 $self_stretch = isset( $child_layout['selfStretch'] ) ? $child_layout['selfStretch'] : null;
     613                $self_stretch = $child_layout['selfStretch'] ?? null;
    614614
    615615                if ( 'fixed' === $self_stretch && isset( $child_layout['flexSize'] ) ) {
    … …  
    641641                if ( isset( $child_layout['columnSpan'] ) && ( isset( $block['parentLayout']['minimumColumnWidth'] ) || ! isset( $block['parentLayout']['columnCount'] ) ) ) {
    642642                        $column_span_number  = floatval( $child_layout['columnSpan'] );
    643                         $parent_column_width = isset( $block['parentLayout']['minimumColumnWidth'] ) ? $block['parentLayout']['minimumColumnWidth'] : '12rem';
     643                        $parent_column_width = $block['parentLayout']['minimumColumnWidth'] ?? '12rem';
    644644                        $parent_column_value = floatval( $parent_column_width );
    645645                        $parent_column_unit  = explode( $parent_column_value, $parent_column_width );
    … …  
    720720
    721721        $global_settings = wp_get_global_settings();
    722         $fallback_layout = isset( $block_type->supports['layout']['default'] )
    723                 ? $block_type->supports['layout']['default']
    724                 : array();
     722        $fallback_layout = $block_type->supports['layout']['default'] ?? array();
    725723        if ( empty( $fallback_layout ) ) {
    726                 $fallback_layout = isset( $block_type->supports['__experimentalLayout']['default'] )
    727                         ? $block_type->supports['__experimentalLayout']['default']
    728                         : array();
    729         }
    730         $used_layout = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $fallback_layout;
     724                $fallback_layout = $block_type->supports['__experimentalLayout']['default'] ?? array();
     725        }
     726        $used_layout = $block['attrs']['layout'] ?? $fallback_layout;
    731727
    732728        $class_names        = array();
    … …  
    738734        }
    739735
    740         $root_padding_aware_alignments = isset( $global_settings['useRootPaddingAwareAlignments'] )
    741                 ? $global_settings['useRootPaddingAwareAlignments']
    742                 : false;
     736        $root_padding_aware_alignments = $global_settings['useRootPaddingAwareAlignments'] ?? false;
    743737
    744738        if (
    … …  
    770764        // Get classname for layout type.
    771765        if ( isset( $used_layout['type'] ) ) {
    772                 $layout_classname = isset( $layout_definitions[ $used_layout['type'] ]['className'] )
    773                         ? $layout_definitions[ $used_layout['type'] ]['className']
    774                         : '';
     766                $layout_classname = $layout_definitions[ $used_layout['type'] ]['className'] ?? '';
    775767        } else {
    776                 $layout_classname = isset( $layout_definitions['default']['className'] )
    777                         ? $layout_definitions['default']['className']
    778                         : '';
     768                $layout_classname = $layout_definitions['default']['className'] ?? '';
    779769        }
    780770
    … …  
    789779        if ( ! current_theme_supports( 'disable-layout-styles' ) ) {
    790780
    791                 $gap_value = isset( $block['attrs']['style']['spacing']['blockGap'] )
    792                         ? $block['attrs']['style']['spacing']['blockGap']
    793                         : null;
     781                $gap_value = $block['attrs']['style']['spacing']['blockGap'] ?? null;
    794782                /*
    795783                 * Skip if gap value contains unsupported characters.
    … …  
    805793                }
    806794
    807                 $fallback_gap_value = isset( $block_type->supports['spacing']['blockGap']['__experimentalDefault'] )
    808                         ? $block_type->supports['spacing']['blockGap']['__experimentalDefault']
    809                         : '0.5em';
    810                 $block_spacing      = isset( $block['attrs']['style']['spacing'] )
    811                         ? $block['attrs']['style']['spacing']
    812                         : null;
     795                $fallback_gap_value = $block_type->supports['spacing']['blockGap']['__experimentalDefault'] ?? '0.5em';
     796                $block_spacing      = $block['attrs']['style']['spacing'] ?? null;
    813797
    814798                /*
    … …  
    818802                $should_skip_gap_serialization = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'blockGap' );
    819803
    820                 $block_gap             = isset( $global_settings['spacing']['blockGap'] )
    821                         ? $global_settings['spacing']['blockGap']
    822                         : null;
     804                $block_gap             = $global_settings['spacing']['blockGap'] ?? null;
    823805                $has_block_gap_support = isset( $block_gap );
    824806
    … …  
    918900         */
    919901        $inner_block_wrapper_classes = null;
    920         $first_chunk                 = isset( $block['innerContent'][0] ) ? $block['innerContent'][0] : null;
     902        $first_chunk                 = $block['innerContent'][0] ?? null;
    921903        if ( is_string( $first_chunk ) && count( $block['innerContent'] ) > 1 ) {
    922904                $first_chunk_processor = new WP_HTML_Tag_Processor( $first_chunk );
    … …  
    1004986 */
    1005987function wp_restore_group_inner_container( $block_content, $block ) {
    1006         $tag_name                         = isset( $block['attrs']['tagName'] ) ? $block['attrs']['tagName'] : 'div';
     988        $tag_name                         = $block['attrs']['tagName'] ?? 'div';
    1007989        $group_with_inner_container_regex = sprintf(
    1008990                '/(^\s*<%1$s\b[^>]*wp-block-group(\s|")[^>]*>)(\s*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/U',

  • trunk/src/wp-includes/block-supports/position.php

    r56709 r61430  
    5252
    5353        $global_settings          = wp_get_global_settings();
    54         $theme_has_sticky_support = isset( $global_settings['position']['sticky'] ) ? $global_settings['position']['sticky'] : false;
    55         $theme_has_fixed_support  = isset( $global_settings['position']['fixed'] ) ? $global_settings['position']['fixed'] : false;
     54        $theme_has_sticky_support = $global_settings['position']['sticky'] ?? false;
     55        $theme_has_fixed_support  = $global_settings['position']['fixed'] ?? false;
    5656
    5757        // Only allow output for position types that the theme supports.
    … …  
    6464        }
    6565
    66         $style_attribute = isset( $block['attrs']['style'] ) ? $block['attrs']['style'] : null;
     66        $style_attribute = $block['attrs']['style'] ?? null;
    6767        $class_name      = wp_unique_id( 'wp-container-' );
    6868        $selector        = ".$class_name";
    6969        $position_styles = array();
    70         $position_type   = isset( $style_attribute['position']['type'] ) ? $style_attribute['position']['type'] : '';
     70        $position_type   = $style_attribute['position']['type'] ?? '';
    7171        $wrapper_classes = array();
    7272
    … …  
    7979
    8080                foreach ( $sides as $side ) {
    81                         $side_value = isset( $style_attribute['position'][ $side ] ) ? $style_attribute['position'][ $side ] : null;
     81                        $side_value = $style_attribute['position'][ $side ] ?? null;
    8282                        if ( null !== $side_value ) {
    8383                                /*

  • trunk/src/wp-includes/block-supports/settings.php

    r56709 r61430  
    4646
    4747        // return early if no settings are found on the block attributes.
    48         $block_settings = isset( $block['attrs']['settings'] ) ? $block['attrs']['settings'] : null;
     48        $block_settings = $block['attrs']['settings'] ?? null;
    4949        if ( empty( $block_settings ) ) {
    5050                return $block_content;
    … …  
    8383
    8484        // return early if no settings are found on the block attributes.
    85         $block_settings = isset( $block['attrs']['settings'] ) ? $block['attrs']['settings'] : null;
     85        $block_settings = $block['attrs']['settings'] ?? null;
    8686        if ( empty( $block_settings ) ) {
    8787                return null;

  • trunk/src/wp-includes/block-supports/spacing.php

    r56709 r61430  
    5353        $has_padding_support = block_has_support( $block_type, array( 'spacing', 'padding' ), false );
    5454        $has_margin_support  = block_has_support( $block_type, array( 'spacing', 'margin' ), false );
    55         $block_styles        = isset( $block_attributes['style'] ) ? $block_attributes['style'] : null;
     55        $block_styles        = $block_attributes['style'] ?? null;
    5656
    5757        if ( ! $block_styles ) {
    … …  
    6666        );
    6767        if ( $has_padding_support && ! $skip_padding ) {
    68                 $spacing_block_styles['padding'] = isset( $block_styles['spacing']['padding'] ) ? $block_styles['spacing']['padding'] : null;
     68                $spacing_block_styles['padding'] = $block_styles['spacing']['padding'] ?? null;
    6969        }
    7070        if ( $has_margin_support && ! $skip_margin ) {
    71                 $spacing_block_styles['margin'] = isset( $block_styles['spacing']['margin'] ) ? $block_styles['spacing']['margin'] : null;
     71                $spacing_block_styles['margin'] = $block_styles['spacing']['margin'] ?? null;
    7272        }
    7373        $styles = wp_style_engine_get_styles( array( 'spacing' => $spacing_block_styles ) );

  • trunk/src/wp-includes/block-supports/typography.php

    r61246 r61430  
    2121        }
    2222
    23         $typography_supports = isset( $block_type->supports['typography'] ) ? $block_type->supports['typography'] : false;
     23        $typography_supports = $block_type->supports['typography'] ?? false;
    2424        if ( ! $typography_supports ) {
    2525                return;
    2626        }
    2727
    28         $has_font_family_support     = isset( $typography_supports['__experimentalFontFamily'] ) ? $typography_supports['__experimentalFontFamily'] : false;
    29         $has_font_size_support       = isset( $typography_supports['fontSize'] ) ? $typography_supports['fontSize'] : false;
    30         $has_font_style_support      = isset( $typography_supports['__experimentalFontStyle'] ) ? $typography_supports['__experimentalFontStyle'] : false;
    31         $has_font_weight_support     = isset( $typography_supports['__experimentalFontWeight'] ) ? $typography_supports['__experimentalFontWeight'] : false;
    32         $has_letter_spacing_support  = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] : false;
    33         $has_line_height_support     = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] : false;
    34         $has_text_align_support      = isset( $typography_supports['textAlign'] ) ? $typography_supports['textAlign'] : false;
    35         $has_text_columns_support    = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] : false;
    36         $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] : false;
    37         $has_text_transform_support  = isset( $typography_supports['__experimentalTextTransform'] ) ? $typography_supports['__experimentalTextTransform'] : false;
    38         $has_writing_mode_support    = isset( $typography_supports['__experimentalWritingMode'] ) ? $typography_supports['__experimentalWritingMode'] : false;
     28        $has_font_family_support     = $typography_supports['__experimentalFontFamily'] ?? false;
     29        $has_font_size_support       = $typography_supports['fontSize'] ?? false;
     30        $has_font_style_support      = $typography_supports['__experimentalFontStyle'] ?? false;
     31        $has_font_weight_support     = $typography_supports['__experimentalFontWeight'] ?? false;
     32        $has_letter_spacing_support  = $typography_supports['__experimentalLetterSpacing'] ?? false;
     33        $has_line_height_support     = $typography_supports['lineHeight'] ?? false;
     34        $has_text_align_support      = $typography_supports['textAlign'] ?? false;
     35        $has_text_columns_support    = $typography_supports['textColumns'] ?? false;
     36        $has_text_decoration_support = $typography_supports['__experimentalTextDecoration'] ?? false;
     37        $has_text_transform_support  = $typography_supports['__experimentalTextTransform'] ?? false;
     38        $has_writing_mode_support    = $typography_supports['__experimentalWritingMode'] ?? false;
    3939
    4040        $has_typography_support = $has_font_family_support
    … …  
    9292        }
    9393
    94         $typography_supports = isset( $block_type->supports['typography'] )
    95                 ? $block_type->supports['typography']
    96                 : false;
     94        $typography_supports = $block_type->supports['typography'] ?? false;
    9795        if ( ! $typography_supports ) {
    9896                return array();
    … …  
    103101        }
    104102
    105         $has_font_family_support     = isset( $typography_supports['__experimentalFontFamily'] ) ? $typography_supports['__experimentalFontFamily'] : false;
    106         $has_font_size_support       = isset( $typography_supports['fontSize'] ) ? $typography_supports['fontSize'] : false;
    107         $has_font_style_support      = isset( $typography_supports['__experimentalFontStyle'] ) ? $typography_supports['__experimentalFontStyle'] : false;
    108         $has_font_weight_support     = isset( $typography_supports['__experimentalFontWeight'] ) ? $typography_supports['__experimentalFontWeight'] : false;
    109         $has_letter_spacing_support  = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] : false;
    110         $has_line_height_support     = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] : false;
    111         $has_text_align_support      = isset( $typography_supports['textAlign'] ) ? $typography_supports['textAlign'] : false;
    112         $has_text_columns_support    = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] : false;
    113         $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] : false;
    114         $has_text_transform_support  = isset( $typography_supports['__experimentalTextTransform'] ) ? $typography_supports['__experimentalTextTransform'] : false;
    115         $has_writing_mode_support    = isset( $typography_supports['__experimentalWritingMode'] ) ? $typography_supports['__experimentalWritingMode'] : false;
     103        $has_font_family_support     = $typography_supports['__experimentalFontFamily'] ?? false;
     104        $has_font_size_support       = $typography_supports['fontSize'] ?? false;
     105        $has_font_style_support      = $typography_supports['__experimentalFontStyle'] ?? false;
     106        $has_font_weight_support     = $typography_supports['__experimentalFontWeight'] ?? false;
     107        $has_letter_spacing_support  = $typography_supports['__experimentalLetterSpacing'] ?? false;
     108        $has_line_height_support     = $typography_supports['lineHeight'] ?? false;
     109        $has_text_align_support      = $typography_supports['textAlign'] ?? false;
     110        $has_text_columns_support    = $typography_supports['textColumns'] ?? false;
     111        $has_text_decoration_support = $typography_supports['__experimentalTextDecoration'] ?? false;
     112        $has_text_transform_support  = $typography_supports['__experimentalTextTransform'] ?? false;
     113        $has_writing_mode_support    = $typography_supports['__experimentalWritingMode'] ?? false;
    116114
    117115        // Whether to skip individual block support features.
    … …  
    133131                        ? "var:preset|font-size|{$block_attributes['fontSize']}"
    134132                        : null;
    135                 $custom_font_size                    = isset( $block_attributes['style']['typography']['fontSize'] )
    136                         ? $block_attributes['style']['typography']['fontSize']
    137                         : null;
     133                $custom_font_size                    = $block_attributes['style']['typography']['fontSize'] ?? null;
    138134                $typography_block_styles['fontSize'] = $preset_font_size ? $preset_font_size : wp_get_typography_font_size_value(
    139135                        array(
    … …  
    176172
    177173        if ( $has_line_height_support && ! $should_skip_line_height ) {
    178                 $typography_block_styles['lineHeight'] = isset( $block_attributes['style']['typography']['lineHeight'] )
    179                         ? $block_attributes['style']['typography']['lineHeight']
    180                         : null;
     174                $typography_block_styles['lineHeight'] = $block_attributes['style']['typography']['lineHeight'] ?? null;
    181175        }
    182176
    183177        if ( $has_text_align_support && ! $should_skip_text_align ) {
    184                 $typography_block_styles['textAlign'] = isset( $block_attributes['style']['typography']['textAlign'] )
    185                         ? $block_attributes['style']['typography']['textAlign']
    186                         : null;
     178                $typography_block_styles['textAlign'] = $block_attributes['style']['typography']['textAlign'] ?? null;
    187179        }
    188180
    189181        if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) {
    190                 $typography_block_styles['textColumns'] = isset( $block_attributes['style']['typography']['textColumns'] )
    191                         ? $block_attributes['style']['typography']['textColumns']
    192                         : null;
     182                $typography_block_styles['textColumns'] = $block_attributes['style']['typography']['textColumns'] ?? null;
    193183        }
    194184
    … …  
    230220                isset( $block_attributes['style']['typography']['writingMode'] )
    231221        ) {
    232                 $typography_block_styles['writingMode'] = isset( $block_attributes['style']['typography']['writingMode'] )
    233                         ? $block_attributes['style']['typography']['writingMode']
    234                         : null;
     222                $typography_block_styles['writingMode'] = $block_attributes['style']['typography']['writingMode'] ?? null;
    235223        }
    236224
    … …  
    453441 */
    454442function wp_get_computed_fluid_typography_value( $args = array() ) {
    455         $maximum_viewport_width_raw = isset( $args['maximum_viewport_width'] ) ? $args['maximum_viewport_width'] : null;
    456         $minimum_viewport_width_raw = isset( $args['minimum_viewport_width'] ) ? $args['minimum_viewport_width'] : null;
    457         $maximum_font_size_raw      = isset( $args['maximum_font_size'] ) ? $args['maximum_font_size'] : null;
    458         $minimum_font_size_raw      = isset( $args['minimum_font_size'] ) ? $args['minimum_font_size'] : null;
    459         $scale_factor               = isset( $args['scale_factor'] ) ? $args['scale_factor'] : null;
     443        $maximum_viewport_width_raw = $args['maximum_viewport_width'] ?? null;
     444        $minimum_viewport_width_raw = $args['minimum_viewport_width'] ?? null;
     445        $maximum_font_size_raw      = $args['maximum_font_size'] ?? null;
     446        $minimum_font_size_raw      = $args['minimum_font_size'] ?? null;
     447        $scale_factor               = $args['scale_factor'] ?? null;
    460448
    461449        // Normalizes the minimum font size in order to use the value for calculations.
    … …  
    466454         * otherwise the result will not be accurate.
    467455         */
    468         $font_size_unit = isset( $minimum_font_size['unit'] ) ? $minimum_font_size['unit'] : 'rem';
     456        $font_size_unit = $minimum_font_size['unit'] ?? 'rem';
    469457
    470458        // Normalizes the maximum font size in order to use the value for calculations.
    … …  
    599587        }
    600588
    601         $fluid_settings  = isset( $typography_settings['fluid'] ) ? $typography_settings['fluid'] : array();
    602         $layout_settings = isset( $settings['layout'] ) ? $settings['layout'] : array();
     589        $fluid_settings  = $typography_settings['fluid'] ?? array();
     590        $layout_settings = $settings['layout'] ?? array();
    603591
    604592        // Defaults.
    … …  
    611599
    612600        // Defaults overrides.
    613         $minimum_viewport_width = isset( $fluid_settings['minViewportWidth'] ) ? $fluid_settings['minViewportWidth'] : $default_minimum_viewport_width;
     601        $minimum_viewport_width = $fluid_settings['minViewportWidth'] ?? $default_minimum_viewport_width;
    614602        $maximum_viewport_width = isset( $layout_settings['wideSize'] ) && ! empty( wp_get_typography_value_and_unit( $layout_settings['wideSize'] ) ) ? $layout_settings['wideSize'] : $default_maximum_viewport_width;
    615603        if ( isset( $fluid_settings['maxViewportWidth'] ) ) {
    … …  
    620608
    621609        // Try to grab explicit min and max fluid font sizes.
    622         $minimum_font_size_raw = isset( $fluid_font_size_settings['min'] ) ? $fluid_font_size_settings['min'] : null;
    623         $maximum_font_size_raw = isset( $fluid_font_size_settings['max'] ) ? $fluid_font_size_settings['max'] : null;
     610        $minimum_font_size_raw = $fluid_font_size_settings['min'] ?? null;
     611        $maximum_font_size_raw = $fluid_font_size_settings['max'] ?? null;
    624612
    625613        // Font sizes.
Note: See TracChangeset for help on using the changeset viewer.