WordPress.org
Get WordPress

Make WordPress Core

Changeset 61455


Ignore:
Timestamp:
01/09/2026 02:46:30 AM (3 months ago)
Author:
westonruter
Message:

Code Modernization: Upgrade/Install: 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 [61454], [61453], [61445], [61444], [61443], [61442], [61436], [61435], [61434], [61403], [61433], [61432], [61431], [61430], [61429], [61424], [61404], [61403].

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

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/includes/class-core-upgrader.php

    r59182 r61455  
    404404        global $wp_version, $wp_local_package;
    405405
    406         $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
     406        $checksums = get_core_checksums( $wp_version, $wp_local_package ?? 'en_US' );
    407407
    408408        if ( ! is_array( $checksums ) ) {

  • trunk/src/wp-admin/includes/class-language-pack-upgrader.php

    r60275 r61455  
    266266                'language' => $language_update->language,
    267267                'type'     => $language_update->type,
    268                 'slug'     => isset( $language_update->slug ) ? $language_update->slug : 'default',
     268                'slug'     => $language_update->slug ?? 'default',
    269269                'version'  => $language_update->version,
    270270            );

  • trunk/src/wp-admin/includes/class-plugin-installer-skin.php

    r59159 r61455  
    4646        $this->type      = $args['type'];
    4747        $this->url       = $args['url'];
    48         $this->api       = isset( $args['api'] ) ? $args['api'] : array();
     48        $this->api       = $args['api'] ?? array();
    4949        $this->overwrite = $args['overwrite'];
    5050
    … …  
    266266        $blocked_message .= '<ul class="ul-disc">';
    267267
    268         $requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
    269         $requires_wp  = isset( $new_plugin_data['RequiresWP'] ) ? $new_plugin_data['RequiresWP'] : null;
     268        $requires_php = $new_plugin_data['RequiresPHP'] ?? null;
     269        $requires_wp  = $new_plugin_data['RequiresWP'] ?? null;
    270270
    271271        if ( ! is_php_version_compatible( $requires_php ) ) {

  • trunk/src/wp-admin/includes/class-plugin-upgrader.php

    r60997 r61455  
    491491        }
    492492
    493         $requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
    494         $requires_wp  = isset( $new_plugin_data['RequiresWP'] ) ? $new_plugin_data['RequiresWP'] : null;
     493        $requires_php = $new_plugin_data['RequiresPHP'] ?? null;
     494        $requires_wp  = $new_plugin_data['RequiresWP'] ?? null;
    495495
    496496        if ( ! is_php_version_compatible( $requires_php ) ) {
    … …  
    571571        }
    572572
    573         $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
     573        $plugin = $plugin['plugin'] ?? '';
    574574        if ( empty( $plugin ) ) {
    575575            return new WP_Error( 'bad_request', $this->strings['bad_request'] );
    … …  
    605605        }
    606606
    607         $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
     607        $plugin = $plugin['plugin'] ?? '';
    608608
    609609        // Only run if plugin is active.
    … …  
    641641        }
    642642
    643         $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
     643        $plugin = $plugin['plugin'] ?? '';
    644644
    645645        // Only run if plugin is active.
    … …  
    680680        }
    681681
    682         $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
     682        $plugin = $plugin['plugin'] ?? '';
    683683        if ( empty( $plugin ) ) {
    684684            return new WP_Error( 'bad_request', $this->strings['bad_request'] );

  • trunk/src/wp-admin/includes/class-theme-installer-skin.php

    r61195 r61455  
    4646        $this->type      = $args['type'];
    4747        $this->url       = $args['url'];
    48         $this->api       = isset( $args['api'] ) ? $args['api'] : array();
     48        $this->api       = $args['api'] ?? array();
    4949        $this->overwrite = $args['overwrite'];
    5050
    … …  
    311311        $blocked_message .= '<ul class="ul-disc">';
    312312
    313         $requires_php = isset( $new_theme_data['RequiresPHP'] ) ? $new_theme_data['RequiresPHP'] : null;
    314         $requires_wp  = isset( $new_theme_data['RequiresWP'] ) ? $new_theme_data['RequiresWP'] : null;
     313        $requires_php = $new_theme_data['RequiresPHP'] ?? null;
     314        $requires_wp  = $new_theme_data['RequiresWP'] ?? null;
    315315
    316316        if ( ! is_php_version_compatible( $requires_php ) ) {

  • trunk/src/wp-admin/includes/class-theme-upgrader.php

    r61028 r61455  
    640640        }
    641641
    642         $requires_php = isset( $new_theme_data['RequiresPHP'] ) ? $new_theme_data['RequiresPHP'] : null;
    643         $requires_wp  = isset( $new_theme_data['RequiresWP'] ) ? $new_theme_data['RequiresWP'] : null;
     642        $requires_php = $new_theme_data['RequiresPHP'] ?? null;
     643        $requires_wp  = $new_theme_data['RequiresWP'] ?? null;
    644644
    645645        if ( ! is_php_version_compatible( $requires_php ) ) {
    … …  
    686686        }
    687687
    688         $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
     688        $theme = $theme['theme'] ?? '';
    689689
    690690        // Only run if active theme.
    … …  
    718718        }
    719719
    720         $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
     720        $theme = $theme['theme'] ?? '';
    721721
    722722        // Only run if active theme.

  • trunk/src/wp-admin/includes/update-core.php

    r61440 r61455  
    12391239        $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
    12401240
    1241         $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
     1241        $checksums = get_core_checksums( $wp_version, $wp_local_package ?? 'en_US' );
    12421242
    12431243        if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) ) {

  • trunk/src/wp-admin/includes/update.php

    r59861 r61455  
    471471
    472472    $plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
    473     $plugin_slug = isset( $response->slug ) ? $response->slug : $response->id;
     473    $plugin_slug = $response->slug ?? $response->id;
    474474
    475475    if ( isset( $response->slug ) ) {
    … …  
    505505        }
    506506
    507         $requires_php   = isset( $response->requires_php ) ? $response->requires_php : null;
     507        $requires_php   = $response->requires_php ?? null;
    508508        $compatible_php = is_php_version_compatible( $requires_php );
    509509        $notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
    … …  
    697697    $active = $theme->is_allowed( 'network' ) ? ' active' : '';
    698698
    699     $requires_wp  = isset( $response['requires'] ) ? $response['requires'] : null;
    700     $requires_php = isset( $response['requires_php'] ) ? $response['requires_php'] : null;
     699    $requires_wp  = $response['requires'] ?? null;
     700    $requires_php = $response['requires_php'] ?? null;
    701701
    702702    $compatible_wp  = is_wp_version_compatible( $requires_wp );

  • trunk/src/wp-admin/update-core.php

    r61440 r61455  
    543543        }
    544544
    545         $requires_php   = isset( $plugin_data->update->requires_php ) ? $plugin_data->update->requires_php : null;
     545        $requires_php   = $plugin_data->update->requires_php ?? null;
    546546        $compatible_php = is_php_version_compatible( $requires_php );
    547547
    … …  
    688688
    689689    foreach ( $themes as $stylesheet => $theme ) {
    690         $requires_wp  = isset( $theme->update['requires'] ) ? $theme->update['requires'] : null;
    691         $requires_php = isset( $theme->update['requires_php'] ) ? $theme->update['requires_php'] : null;
     690        $requires_wp  = $theme->update['requires'] ?? null;
     691        $requires_php = $theme->update['requires_php'] ?? null;
    692692
    693693        $compatible_wp  = is_wp_version_compatible( $requires_wp );
    … …  
    855855    $url = wp_nonce_url( $url, 'upgrade-core' );
    856856
    857     $version = isset( $_POST['version'] ) ? $_POST['version'] : false;
    858     $locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
     857    $version = $_POST['version'] ?? false;
     858    $locale  = $_POST['locale'] ?? 'en_US';
    859859    $update  = find_core_update( $version, $locale );
    860860    if ( ! $update ) {
    … …  
    948948 */
    949949function do_dismiss_core_update() {
    950     $version = isset( $_POST['version'] ) ? $_POST['version'] : false;
    951     $locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
     950    $version = $_POST['version'] ?? false;
     951    $locale  = $_POST['locale'] ?? 'en_US';
    952952    $update  = find_core_update( $version, $locale );
    953953    if ( ! $update ) {
    … …  
    965965 */
    966966function do_undismiss_core_update() {
    967     $version = isset( $_POST['version'] ) ? $_POST['version'] : false;
    968     $locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
     967    $version = $_POST['version'] ?? false;
     968    $locale  = $_POST['locale'] ?? 'en_US';
    969969    $update  = find_core_update( $version, $locale );
    970970    if ( ! $update ) {
    … …  
    976976}
    977977
    978 $action = isset( $_GET['action'] ) ? $_GET['action'] : 'upgrade-core';
     978$action = $_GET['action'] ?? 'upgrade-core';
    979979
    980980$upgrade_error = false;

  • trunk/src/wp-admin/update.php

    r57388 r61455  
    2323    $plugin = isset( $_REQUEST['plugin'] ) ? trim( $_REQUEST['plugin'] ) : '';
    2424    $theme  = isset( $_REQUEST['theme'] ) ? urldecode( $_REQUEST['theme'] ) : '';
    25     $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
     25    $action = $_REQUEST['action'] ?? '';
    2626
    2727    if ( 'update-selected' === $action ) {

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

    r61001 r61455  
    102102        'locale'             => $locale,
    103103        'mysql'              => $mysql_version,
    104         'local_package'      => isset( $wp_local_package ) ? $wp_local_package : '',
     104        'local_package'      => $wp_local_package ?? '',
    105105        'blogs'              => $num_blogs,
    106106        'users'              => get_user_count(),
    … …  
    580580                if ( isset( $translation['language'], $translation['package'] ) ) {
    581581                    $translation['type'] = 'plugin';
    582                     $translation['slug'] = isset( $update->slug ) ? $update->slug : $update->id;
     582                    $translation['slug'] = $update->slug ?? $update->id;
    583583
    584584                    $updates->translations[] = $translation;
    … …  
    857857                if ( isset( $translation['language'], $translation['package'] ) ) {
    858858                    $translation['type'] = 'theme';
    859                     $translation['slug'] = isset( $update->theme ) ? $update->theme : $update->id;
     859                    $translation['slug'] = $update->theme ?? $update->id;
    860860
    861861                    $new_update->translations[] = $translation;
Note: See TracChangeset for help on using the changeset viewer.