Commit a87e822ae2 for wordpress.org
commit a87e822ae2ddee21f25ba6f28097cde2fcc4be3a
Author: SergeyBiryukov <sergeybiryukov@git.wordpress.org>
Date: Wed Oct 28 23:34:03 2026 +0000
Code Modernization: Use the null coalescing operator in the Secrets API.
Replaces the remaining ternaries in the Secrets API that return a tested value or a fallback with the null coalescing operator (`??`).
Developed in https://github.com/WordPress/wordpress-develop/pull/14981.
Follow-up to r64337.
Props Soean, westonruter, mukesh27.
See #65818.
Built from https://develop.svn.wordpress.org/trunk@64995
git-svn-id: http://core.svn.wordpress.org/trunk@64145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-admin/includes/secrets-site-health.php b/wp-admin/includes/secrets-site-health.php
index eef44e9266..d6a19b4920 100644
--- a/wp-admin/includes/secrets-site-health.php
+++ b/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/wp-includes/secrets/class-wp-secrets-key-manager.php b/wp-includes/secrets/class-wp-secrets-key-manager.php
index 1cd92a3837..91740370d8 100644
--- a/wp-includes/secrets/class-wp-secrets-key-manager.php
+++ b/wp-includes/secrets/class-wp-secrets-key-manager.php
@@ -158,7 +158,7 @@ final class WP_Secrets_Key_Manager {
$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/wp-includes/secrets/class-wp-secrets-libsodium-provider.php b/wp-includes/secrets/class-wp-secrets-libsodium-provider.php
index dc360a1348..0c21195c64 100644
--- a/wp-includes/secrets/class-wp-secrets-libsodium-provider.php
+++ b/wp-includes/secrets/class-wp-secrets-libsodium-provider.php
@@ -437,7 +437,7 @@ final class WP_Secrets_Libsodium_Provider implements WP_Secrets_Provider {
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,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f5bf154142..11b659bd7e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '7.2-beta3-64994';
+$wp_version = '7.2-beta3-64995';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.