Changeset 61621

Timestamp:

02/12/2026 07:40:48 AM (2 months ago)

Author:

westonruter

Message:

Code Modernization: Use null coalescing operator and improve readability of conditional in WP_Theme_JSON::get_styles_for_block().

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

Follow-up to [61607].

Props soean, westonruter, sergeybiryukov, mukesh27.
See #63430, #64263.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)

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

@@ -2942 +2942 @@
 
                 // Process pseudo-selectors for this variation (e.g., :hover, :focus)
-                $block_name                    = isset( $block_metadata['name'] ) ? $block_metadata['name'] : ( in_array( 'blocks', $block_metadata['path'], true ) && count( $block_metadata['path'] ) >= 3 ? $block_metadata['path'][2] : null );
+                if ( isset( $block_metadata['name'] ) ) {
+                    $block_name = $block_metadata['name'];
+                } elseif ( in_array( 'blocks', $block_metadata['path'], true ) && count( $block_metadata['path'] ) >= 3 ) {
+                    $block_name = $block_metadata['path'][2];
+                } else {
+                    $block_name = null;
+                }
                 $variation_pseudo_declarations = static::process_pseudo_selectors( $style_variation_node, $style_variation['selector'], $settings, $block_name );
                 $style_variation_declarations  = array_merge( $style_variation_declarations, $variation_pseudo_declarations );
@@ -3031 +3037 @@
             $block_name  = $block_metadata['path'][2]; // 'core/button'
             $block_data  = _wp_array_get( $this->theme_json, array( 'styles', 'blocks', $block_name ), array() );
-            $pseudo_data = isset( $block_data[ $block_pseudo_selector ] ) ? $block_data[ $block_pseudo_selector ] : array();
+            $pseudo_data = $block_data[ $block_pseudo_selector ] ?? array();
 
             $declarations = static::compute_style_properties( $pseudo_data, $settings, null, $this->theme_json, $selector, $use_root_padding );