From 28d0ad7c05359b219f045f0dfd498993b39ec4de Mon Sep 17 00:00:00 2001 From: Eric Mann Date: Fri, 30 Oct 2026 11:37:12 -0700 Subject: [PATCH] Use the null coalescing operator in the Secrets API Ports r64995 from core trunk, which replaces the remaining ternaries that return a tested value or a fallback with ??. Props Soean, westonruter, mukesh27. --- src/wp-admin/includes/secrets-site-health.php | 2 +- src/wp-includes/secrets/class-wp-secrets-key-manager.php | 2 +- src/wp-includes/secrets/class-wp-secrets-libsodium-provider.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/secrets-site-health.php b/src/wp-admin/includes/secrets-site-health.php index eef44e9..d6a19b4 100644 --- a/src/wp-admin/includes/secrets-site-health.php +++ b/src/wp-admin/includes/secrets-site-health.php @@ -67,7 +67,7 @@ function wp_secrets_site_health_result( string $test, string $label, string $sta 'status' => $status, 'badge' => array( 'label' => __( 'Security' ), - 'color' => isset( $colors[ $status ] ) ? $colors[ $status ] : 'blue', + 'color' => $colors[ $status ] ?? 'blue', ), 'description' => $description, ); diff --git a/src/wp-includes/secrets/class-wp-secrets-key-manager.php b/src/wp-includes/secrets/class-wp-secrets-key-manager.php index 1cd92a3..9174037 100644 --- a/src/wp-includes/secrets/class-wp-secrets-key-manager.php +++ b/src/wp-includes/secrets/class-wp-secrets-key-manager.php @@ -158,7 +158,7 @@ public function get_master_key( string $scope, ?int $site_id = null ) { $subkey_id = self::NETWORK_SUBKEY_ID; $context = self::NETWORK_KDF_CONTEXT; } else { - $subkey_id = null === $site_id ? get_current_blog_id() : $site_id; + $subkey_id = $site_id ?? get_current_blog_id(); if ( $subkey_id < 1 ) { $message = __( 'The site id must be a positive integer.' ); diff --git a/src/wp-includes/secrets/class-wp-secrets-libsodium-provider.php b/src/wp-includes/secrets/class-wp-secrets-libsodium-provider.php index dc360a1..0c21195 100644 --- a/src/wp-includes/secrets/class-wp-secrets-libsodium-provider.php +++ b/src/wp-includes/secrets/class-wp-secrets-libsodium-provider.php @@ -437,7 +437,7 @@ public function set( string $name, $value, bool $network = false, bool $needs_ro do_action( 'wp_secret_changed', $name, - null !== $action ? $action : ( $is_update ? 'updated' : 'created' ), + $action ?? ( $is_update ? 'updated' : 'created' ), get_current_user_id(), $new_slot['created'], $old_fingerprint,