WordPress.org
Get WordPress

Make WordPress Core

Changeset 61637


Ignore:
Timestamp:
02/13/2026 05:51:41 PM (6 months ago)
Author:
westonruter
Message:

Code Modernization: Use null coalescing operator instead of ternaries where possible.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10911

Follow-up to [61621], [61464].

Props soean, westonruter.
See #63430.

Location:
trunk/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/edit-comments.php

    r61434 r61637  
    320320        || isset( $_REQUEST['same'] )
    321321) {
    322         $approved  = isset( $_REQUEST['approved'] ) ? (int) $_REQUEST['approved'] : 0;
    323         $deleted   = isset( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
    324         $trashed   = isset( $_REQUEST['trashed'] ) ? (int) $_REQUEST['trashed'] : 0;
    325         $untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
    326         $spammed   = isset( $_REQUEST['spammed'] ) ? (int) $_REQUEST['spammed'] : 0;
    327         $unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
    328         $same      = isset( $_REQUEST['same'] ) ? (int) $_REQUEST['same'] : 0;
     322        $approved  = (int) ( $_REQUEST['approved'] ?? 0 );
     323        $deleted   = (int) ( $_REQUEST['deleted'] ?? 0 );
     324        $trashed   = (int) ( $_REQUEST['trashed'] ?? 0 );
     325        $untrashed = (int) ( $_REQUEST['untrashed'] ?? 0 );
     326        $spammed   = (int) ( $_REQUEST['spammed'] ?? 0 );
     327        $unspammed = (int) ( $_REQUEST['unspammed'] ?? 0 );
     328        $same      = (int) ( $_REQUEST['same'] ?? 0 );
    329329
    330330        if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {

  • trunk/src/wp-includes/class-wp-block-parser-frame.php

    r61504 r61637  
    7474                $this->token_start        = $token_start;
    7575                $this->token_length       = $token_length;
    76                 $this->prev_offset        = isset( $prev_offset ) ? $prev_offset : $token_start + $token_length;
     76                $this->prev_offset        = $prev_offset ?? $token_start + $token_length;
    7777                $this->leading_html_start = $leading_html_start;
    7878        }

  • trunk/src/wp-includes/class-wp-locale.php

    r59870 r61637  
    451451                 * Do not translate into your own language.
    452452                 */
    453                 $word_count_type = is_null( $this->word_count_type ) ? _x( 'words', 'Word count type. Do not translate!' ) : $this->word_count_type;
     453                $word_count_type = $this->word_count_type ?? _x( 'words', 'Word count type. Do not translate!' );
    454454
    455455                // Check for valid types.

  • trunk/src/wp-includes/class-wp-theme-json-resolver.php

    r61473 r61637  
    145145                if ( null === static::$i18n_schema ) {
    146146                        $i18n_schema         = wp_json_file_decode( __DIR__ . '/theme-i18n.json' );
    147                         static::$i18n_schema = null === $i18n_schema ? array() : $i18n_schema;
     147                        static::$i18n_schema = $i18n_schema ?? array();
    148148                }
    149149

  • trunk/src/wp-includes/customize/class-wp-customize-partial.php

    r54133 r61637  
    231231                         * include PHP warnings or notices.
    232232                         */
    233                         $rendered = null !== $return_render ? $return_render : $ob_render;
     233                        $rendered = $return_render ?? $ob_render;
    234234                }
    235235

  • trunk/src/wp-includes/functions.php

    r61464 r61637  
    952952                        $headers = wp_get_http_headers( $url );
    953953                        if ( $headers ) {
    954                                 $len           = isset( $headers['Content-Length'] ) ? (int) $headers['Content-Length'] : 0;
     954                                $len           = (int) ( $headers['Content-Length'] ?? 0 );
    955955                                $type          = $headers['Content-Type'] ?? '';
    956956                                $allowed_types = array( 'video', 'audio' );

  • trunk/src/wp-includes/interactivity-api/class-wp-interactivity-api.php

    r61494 r61637  
    454454                $this->context_stack   = null;
    455455
    456                 return null === $result ? $html : $result;
     456                return $result ?? $html;
    457457        }
    458458

  • trunk/src/wp-includes/l10n.php

    r60728 r61637  
    14911491        $languages = array();
    14921492
    1493         $path       = is_null( $dir ) ? WP_LANG_DIR : $dir;
     1493        $path       = $dir ?? WP_LANG_DIR;
    14941494        $lang_files = $wp_textdomain_registry->get_language_files_from_path( $path );
    14951495

  • trunk/src/wp-includes/link-template.php

    r61454 r61637  
    111111        } else {
    112112                $post   = get_post( $post );
    113                 $sample = null !== $sample ? $sample : false;
     113                $sample = $sample ?? false;
    114114        }
    115115

  • trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

    r61605 r61637  
    484484                }
    485485
    486                 $page        = isset( $query_args['paged'] ) ? (int) $query_args['paged'] : 0;
     486                $page        = (int) ( $query_args['paged'] ?? 0 );
    487487                $total_posts = $posts_query->found_posts;
    488488

  • trunk/src/wp-includes/user.php

    r61444 r61637  
    729729        }
    730730        $user = wp_get_current_user();
    731         return ( isset( $user->ID ) ? (int) $user->ID : 0 );
     731        return (int) ( $user->ID ?? 0 );
    732732}
    733733
    … …  
    26832683        $userdata_raw = $userdata;
    26842684
    2685         $user_id = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0;
     2685        $user_id = (int) ( $userdata['ID'] ?? 0 );
    26862686        if ( ! $user_id ) {
    26872687                return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );

  • trunk/src/wp-includes/widgets.php

    r61466 r61637  
    17211721        $args['title'] = $args['title'] ?? '';
    17221722        $args['url']   = $args['url'] ?? '';
    1723         $args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
     1723        $args['items'] = (int) ( $args['items'] ?? 0 );
    17241724
    17251725        if ( $args['items'] < 1 || 20 < $args['items'] ) {
    … …  
    17271727        }
    17281728
    1729         $args['show_summary'] = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
    1730         $args['show_author']  = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author'];
    1731         $args['show_date']    = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
     1729        $args['show_summary'] = (int) ( $args['show_summary'] ?? $inputs['show_summary'] );
     1730        $args['show_author']  = (int) ( $args['show_author'] ?? $inputs['show_author'] );
     1731        $args['show_date']    = (int) ( $args['show_date'] ?? $inputs['show_date'] );
    17321732
    17331733        if ( ! empty( $args['error'] ) ) {
    … …  
    17991799        }
    18001800        $url          = sanitize_url( strip_tags( $widget_rss['url'] ) );
    1801         $title        = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
    1802         $show_summary = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
    1803         $show_author  = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] : 0;
    1804         $show_date    = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
     1801        $title        = trim( strip_tags( $widget_rss['title'] ?? '' ) );
     1802        $show_summary = (int) ( $widget_rss['show_summary'] ?? 0 );
     1803        $show_author  = (int) ( $widget_rss['show_author'] ?? 0 );
     1804        $show_date    = (int) ( $widget_rss['show_date'] ?? 0 );
    18051805        $error        = false;
    18061806        $link         = '';
Note: See TracChangeset for help on using the changeset viewer.