Changeset 56709 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

09/26/2023 01:45:23 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Editor: Reduce the use of the _wp_array_get() function to improve performance.

_wp_array_get() is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.

This commit aims to further optimize its usage:

• In many cases, _wp_array_get() can be replaced with a much simpler and faster isset() check.
• The isset() function is capable of checking nested arrays, so isset( $foo['a']['b']['c'] ) will return false even if $foo['a'] is unset, without throwing any errors or warnings.
• When _wp_array_get() cannot be directly replaced with isset(), it would be good practice to wrap it in an isset() function so that _wp_array_get() only runs when it needs to.

Original PR from Gutenberg repository:

• ​#51116 Performance improvement: Reduce the use of the _wp_array_get() function

Follow-up to [55851], [56382].

Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.

File:

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

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

@@ -924 +924 @@
                         // Keep backwards compatibility for support.color.__experimentalDuotone.
                         if ( null === $duotone_selector ) {
-                                $duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), null );
+                                $duotone_support = isset( $block_type->supports['color']['__experimentalDuotone'] )
+                                        ? $block_type->supports['color']['__experimentalDuotone']
+                                        : null;
 
                                 if ( $duotone_support ) {
@@ -1161 +1163 @@
         public function get_custom_css() {
                 // Add the global styles root CSS.
-                $stylesheet = _wp_array_get( $this->theme_json, array( 'styles', 'css' ), '' );
+                $stylesheet = isset( $this->theme_json['styles']['css'] ) ? $this->theme_json['styles']['css'] : '';
 
                 // Add the global styles block CSS.
                 if ( isset( $this->theme_json['styles']['blocks'] ) ) {
                         foreach ( $this->theme_json['styles']['blocks'] as $name => $node ) {
-                                $custom_block_css = _wp_array_get( $this->theme_json, array( 'styles', 'blocks', $name, 'css' ) );
+                                $custom_block_css = isset( $this->theme_json['styles']['blocks'][ $name ]['css'] )
+                                        ? $this->theme_json['styles']['blocks'][ $name ]['css']
+                                        : null;
                                 if ( $custom_block_css ) {
                                         $selector    = static::$blocks_metadata[ $name ]['selector'];
@@ -1285 +1289 @@
 
                 $selector                 = isset( $block_metadata['selector'] ) ? $block_metadata['selector'] : '';
-                $has_block_gap_support    = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'blockGap' ) ) !== null;
+                $has_block_gap_support    = isset( $this->theme_json['settings']['spacing']['blockGap'] );
                 $has_fallback_gap_support = ! $has_block_gap_support; // This setting isn't useful yet: it exists as a placeholder for a future explicit fallback gap styles support.
                 $node                     = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
@@ -1301 +1305 @@
                                 $block_gap_value = static::ROOT_BLOCK_SELECTOR === $selector ? '0.5em' : null;
                                 if ( ! empty( $block_type ) ) {
-                                        $block_gap_value = _wp_array_get( $block_type->supports, array( 'spacing', 'blockGap', '__experimentalDefault' ), null );
+                                        $block_gap_value = isset( $block_type->supports['spacing']['blockGap']['__experimentalDefault'] )
+                                                ? $block_type->supports['spacing']['blockGap']['__experimentalDefault']
+                                                : null;
                                 }
                         } else {
@@ -1327 +1333 @@
                                         }
 
-                                        $class_name    = _wp_array_get( $layout_definition, array( 'className' ), false );
-                                        $spacing_rules = _wp_array_get( $layout_definition, array( 'spacingStyles' ), array() );
+                                        $class_name    = isset( $layout_definition['className'] ) ? $layout_definition['className'] : false;
+                                        $spacing_rules = isset( $layout_definition['spacingStyles'] ) ? $layout_definition['spacingStyles'] : array();
 
                                         if (
@@ -1384 +1390 @@
                         $valid_display_modes = array( 'block', 'flex', 'grid' );
                         foreach ( $layout_definitions as $layout_definition ) {
-                                $class_name       = _wp_array_get( $layout_definition, array( 'className' ), false );
-                                $base_style_rules = _wp_array_get( $layout_definition, array( 'baseStyles' ), array() );
+                                $class_name       = isset( $layout_definition['className'] ) ? $layout_definition['className'] : false;
+                                $base_style_rules = isset( $layout_definition['baseStyles'] ) ? $layout_definition['baseStyles'] : array();
 
                                 if (
@@ -1813 +1819 @@
         protected static function compute_theme_vars( $settings ) {
                 $declarations  = array();
-                $custom_values = _wp_array_get( $settings, array( 'custom' ), array() );
+                $custom_values = isset( $settings['custom'] ) ? $settings['custom'] : array();
                 $css_vars      = static::flatten_tree( $custom_values );
                 foreach ( $css_vars as $key => $value ) {
@@ -2327 +2333 @@
                 $use_root_padding     = isset( $this->theme_json['settings']['useRootPaddingAwareAlignments'] ) && true === $this->theme_json['settings']['useRootPaddingAwareAlignments'];
                 $selector             = $block_metadata['selector'];
-                $settings             = _wp_array_get( $this->theme_json, array( 'settings' ) );
+                $settings             = isset( $this->theme_json['settings'] ) ? $this->theme_json['settings'] : array();
                 $feature_declarations = static::get_feature_declarations_for_node( $block_metadata, $node );
 
@@ -2467 +2473 @@
         public function get_root_layout_rules( $selector, $block_metadata ) {
                 $css              = '';
-                $settings         = _wp_array_get( $this->theme_json, array( 'settings' ) );
+                $settings         = isset( $this->theme_json['settings'] ) ? $this->theme_json['settings'] : array();
                 $use_root_padding = isset( $this->theme_json['settings']['useRootPaddingAwareAlignments'] ) && true === $this->theme_json['settings']['useRootPaddingAwareAlignments'];
 
@@ -2516 +2522 @@
                 $css .= '.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
 
-                $block_gap_value       = _wp_array_get( $this->theme_json, array( 'styles', 'spacing', 'blockGap' ), '0.5em' );
-                $has_block_gap_support = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'blockGap' ) ) !== null;
+                $block_gap_value       = isset( $this->theme_json['styles']['spacing']['blockGap'] ) ? $this->theme_json['styles']['spacing']['blockGap'] : '0.5em';
+                $has_block_gap_support = isset( $this->theme_json['settings']['spacing']['blockGap'] );
                 if ( $has_block_gap_support ) {
                         $block_gap_value = static::get_property_value( $this->theme_json, array( 'styles', 'spacing', 'blockGap' ) );
@@ -3356 +3362 @@
          */
         public function set_spacing_sizes() {
-                $spacing_scale = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'spacingScale' ), array() );
+                $spacing_scale = isset( $this->theme_json['settings']['spacing']['spacingScale'] )
+                        ? $this->theme_json['settings']['spacing']['spacingScale']
+                        : array();
 
                 if ( ! isset( $spacing_scale['steps'] )
@@ -3595 +3603 @@
                 }
 
-                $settings = _wp_array_get( $this->theme_json, array( 'settings' ) );
+                $settings = isset( $this->theme_json['settings'] )
+                        ? $this->theme_json['settings']
+                        : array();
 
                 foreach ( $metadata['selectors'] as $feature => $feature_selectors ) {