From 87f0388e84b6212ff7210d64a624da39933a2b4c Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Mon, 22 Dec 2025 18:54:30 -0800 Subject: [PATCH] Use null coalescing operator for remaining uses of isset() --- src/wp-admin/edit-comments.php | 4 ++-- src/wp-admin/edit-form-advanced.php | 2 +- src/wp-admin/includes/ajax-actions.php | 10 +++++----- src/wp-admin/includes/class-core-upgrader.php | 2 +- .../includes/class-custom-image-header.php | 6 +++--- .../includes/class-plugin-installer-skin.php | 6 +++--- .../includes/class-plugin-upgrader.php | 12 +++++------ .../includes/class-theme-installer-skin.php | 6 +++--- .../includes/class-theme-upgrader.php | 8 ++++---- .../includes/class-wp-community-events.php | 2 +- src/wp-admin/includes/class-wp-debug-data.php | 4 ++-- .../includes/class-wp-links-list-table.php | 2 +- .../includes/class-wp-media-list-table.php | 2 +- .../class-wp-ms-themes-list-table.php | 6 +++--- .../includes/class-wp-ms-users-list-table.php | 2 +- .../class-wp-plugin-install-list-table.php | 4 ++-- .../includes/class-wp-terms-list-table.php | 2 +- .../includes/class-wp-themes-list-table.php | 2 +- .../includes/class-wp-users-list-table.php | 4 ++-- src/wp-admin/includes/credits.php | 2 +- src/wp-admin/includes/image-edit.php | 12 +++++------ src/wp-admin/includes/meta-boxes.php | 4 ++-- src/wp-admin/includes/update-core.php | 2 +- src/wp-admin/includes/update.php | 8 ++++---- src/wp-admin/includes/user.php | 2 +- src/wp-admin/includes/widgets.php | 16 +++++++-------- src/wp-admin/link-parse-opml.php | 6 +++--- src/wp-admin/my-sites.php | 2 +- src/wp-admin/nav-menus.php | 2 +- src/wp-admin/network/site-themes.php | 2 +- src/wp-admin/network/themes.php | 2 +- src/wp-admin/network/upgrade.php | 2 +- src/wp-admin/options-privacy.php | 2 +- src/wp-admin/site-editor.php | 2 +- src/wp-admin/site-health.php | 2 +- src/wp-admin/update-core.php | 20 +++++++++---------- src/wp-admin/update.php | 2 +- src/wp-admin/upload.php | 4 ++-- src/wp-admin/users.php | 2 +- src/wp-admin/widgets-form.php | 8 ++++---- src/wp-includes/script-loader.php | 2 +- src/wp-signup.php | 4 ++-- .../WPHTTP-testcase-redirection-script.php | 6 +++--- tests/phpunit/includes/abstract-testcase.php | 2 +- .../class-wp-unittest-factory-for-term.php | 2 +- tests/phpunit/includes/mock-fs.php | 4 ++-- .../tests/abilities-api/wpRegisterAbility.php | 10 +++++----- .../wpRegisterAbilityCategory.php | 10 +++++----- .../tests/admin/wpPluginsListTable.php | 2 +- .../tests/block-bindings/postMetaSource.php | 2 +- tests/phpunit/tests/cron.php | 2 +- tests/phpunit/tests/dependencies/scripts.php | 6 +++--- .../filesystem/wpFilesystemDirect/base.php | 2 +- .../wpRestFontFamiliesController.php | 5 ++--- .../phpunit/tests/general/wpResourceHints.php | 4 ++-- .../wpInteractivityAPI-wp-router-region.php | 2 +- .../tests/l10n/loadScriptTextdomain.php | 2 +- tests/phpunit/tests/link/getAdjacentPost.php | 4 ++-- tests/phpunit/tests/oembed/controller.php | 2 +- tests/phpunit/tests/post/thumbnails.php | 4 ++-- .../tests/rest-api/application-passwords.php | 2 +- .../rest-pattern-directory-controller.php | 2 +- .../tests/rest-api/rest-post-meta-fields.php | 2 +- .../tests/rest-api/rest-term-meta-fields.php | 2 +- tests/phpunit/tests/shortcode.php | 2 +- 65 files changed, 138 insertions(+), 139 deletions(-) diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php index 8a004b52265ef..29ec964924a4d 100644 --- a/src/wp-admin/edit-comments.php +++ b/src/wp-admin/edit-comments.php @@ -337,7 +337,7 @@ } if ( $spammed > 0 ) { - $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0; + $ids = $_REQUEST['ids'] ?? 0; $messages[] = sprintf( /* translators: %s: Number of comments. */ @@ -359,7 +359,7 @@ } if ( $trashed > 0 ) { - $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0; + $ids = $_REQUEST['ids'] ?? 0; $messages[] = sprintf( /* translators: %s: Number of comments. */ diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php index 0380a48a9c735..a22acd74cc240 100644 --- a/src/wp-admin/edit-form-advanced.php +++ b/src/wp-admin/edit-form-advanced.php @@ -69,7 +69,7 @@ */ $post_ID = isset( $post_ID ) ? (int) $post_ID : 0; $user_ID = isset( $user_ID ) ? (int) $user_ID : 0; -$action = isset( $action ) ? $action : ''; +$action = $action ?? ''; if ( (int) get_option( 'page_for_posts' ) === $post->ID && empty( $post->post_content ) ) { add_action( 'edit_form_after_title', '_wp_posts_page_notice' ); diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index c3955b6d77cc6..2f3804a11b002 100644 --- a/src/wp-admin/includes/ajax-actions.php +++ b/src/wp-admin/includes/ajax-actions.php @@ -1808,7 +1808,7 @@ function wp_ajax_closed_postboxes() { $hidden = isset( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array(); $hidden = array_filter( $hidden ); - $page = isset( $_POST['page'] ) ? $_POST['page'] : ''; + $page = $_POST['page'] ?? ''; if ( sanitize_key( $page ) !== $page ) { wp_die( 0 ); @@ -1839,7 +1839,7 @@ function wp_ajax_closed_postboxes() { */ function wp_ajax_hidden_columns() { check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' ); - $page = isset( $_POST['page'] ) ? $_POST['page'] : ''; + $page = $_POST['page'] ?? ''; if ( sanitize_key( $page ) !== $page ) { wp_die( 0 ); @@ -1988,13 +1988,13 @@ function wp_ajax_menu_locations_save() { function wp_ajax_meta_box_order() { check_ajax_referer( 'meta-box-order' ); $order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false; - $page_columns = isset( $_POST['page_columns'] ) ? $_POST['page_columns'] : 'auto'; + $page_columns = $_POST['page_columns'] ?? 'auto'; if ( 'auto' !== $page_columns ) { $page_columns = (int) $page_columns; } - $page = isset( $_POST['page'] ) ? $_POST['page'] : ''; + $page = $_POST['page'] ?? ''; if ( sanitize_key( $page ) !== $page ) { wp_die( 0 ); @@ -2052,7 +2052,7 @@ function wp_ajax_get_permalink() { function wp_ajax_sample_permalink() { check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' ); $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0; - $title = isset( $_POST['new_title'] ) ? $_POST['new_title'] : ''; + $title = $_POST['new_title'] ?? ''; $slug = isset( $_POST['new_slug'] ) ? $_POST['new_slug'] : null; wp_die( get_sample_permalink_html( $post_id, $title, $slug ) ); } diff --git a/src/wp-admin/includes/class-core-upgrader.php b/src/wp-admin/includes/class-core-upgrader.php index 5cb818cd59bd2..184376654295e 100644 --- a/src/wp-admin/includes/class-core-upgrader.php +++ b/src/wp-admin/includes/class-core-upgrader.php @@ -403,7 +403,7 @@ public static function should_update_to_version( $offered_ver ) { public function check_files() { global $wp_version, $wp_local_package; - $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' ); + $checksums = get_core_checksums( $wp_version, $wp_local_package ?? 'en_US' ); if ( ! is_array( $checksums ) ) { return false; diff --git a/src/wp-admin/includes/class-custom-image-header.php b/src/wp-admin/includes/class-custom-image-header.php index e8a16e47dc80a..fc4ce68549afe 100644 --- a/src/wp-admin/includes/class-custom-image-header.php +++ b/src/wp-admin/includes/class-custom-image-header.php @@ -1351,7 +1351,7 @@ final public function create_attachment_object( $cropped, $parent_attachment_id * @return int Attachment ID. */ final public function insert_attachment( $attachment, $cropped ) { - $parent_id = isset( $attachment['post_parent'] ) ? $attachment['post_parent'] : null; + $parent_id = $attachment['post_parent'] ?? null; unset( $attachment['post_parent'] ); $attachment_id = wp_insert_attachment( $attachment, $cropped ); @@ -1584,8 +1584,8 @@ public function get_uploaded_header_images() { foreach ( $header_images as &$header_image ) { $header_meta = get_post_meta( $header_image['attachment_id'] ); - $header_image['timestamp'] = isset( $header_meta[ $timestamp_key ] ) ? $header_meta[ $timestamp_key ] : ''; - $header_image['alt_text'] = isset( $header_meta[ $alt_text_key ] ) ? $header_meta[ $alt_text_key ] : ''; + $header_image['timestamp'] = $header_meta[ $timestamp_key ] ?? ''; + $header_image['alt_text'] = $header_meta[ $alt_text_key ] ?? ''; } return $header_images; diff --git a/src/wp-admin/includes/class-plugin-installer-skin.php b/src/wp-admin/includes/class-plugin-installer-skin.php index aa97833c59a85..13b4dd7097cc9 100644 --- a/src/wp-admin/includes/class-plugin-installer-skin.php +++ b/src/wp-admin/includes/class-plugin-installer-skin.php @@ -45,7 +45,7 @@ public function __construct( $args = array() ) { $this->type = $args['type']; $this->url = $args['url']; - $this->api = isset( $args['api'] ) ? $args['api'] : array(); + $this->api = $args['api'] ?? array(); $this->overwrite = $args['overwrite']; parent::__construct( $args ); @@ -265,8 +265,8 @@ private function do_overwrite() { $blocked_message = '

' . esc_html__( 'The plugin cannot be updated due to the following:' ) . '

'; $blocked_message .= '