Changeset 56709 for trunk/src/wp-includes/block-supports/colors.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/block-supports/colors.php (modified) (6 diffs)

trunk/src/wp-includes/block-supports/colors.php

@@ -17 +17 @@
  */
 function wp_register_colors_support( $block_type ) {
-        $color_support                 = property_exists( $block_type, 'supports' ) ? _wp_array_get( $block_type->supports, array( 'color' ), false ) : false;
-        $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'text' ), true ) );
-        $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'background' ), true ) );
-        $has_gradients_support         = _wp_array_get( $color_support, array( 'gradients' ), false );
-        $has_link_colors_support       = _wp_array_get( $color_support, array( 'link' ), false );
-        $has_button_colors_support     = _wp_array_get( $color_support, array( 'button' ), false );
-        $has_heading_colors_support    = _wp_array_get( $color_support, array( 'heading' ), false );
+        $color_support = false;
+        if ( property_exists( $block_type, 'supports' ) ) {
+                $color_support = isset( $block_type->supports['color'] ) ? $block_type->supports['color'] : false;
+        }
+        $has_text_colors_support       = true === $color_support ||
+                ( isset( $color_support['text'] ) && $color_support['text'] ) ||
+                ( is_array( $color_support ) && ! isset( $color_support['text'] ) );
+        $has_background_colors_support = true === $color_support ||
+                ( isset( $color_support['background'] ) && $color_support['background'] ) ||
+                ( is_array( $color_support ) && ! isset( $color_support['background'] ) );
+        $has_gradients_support         = isset( $color_support['gradients'] ) ? $color_support['gradients'] : false;
+        $has_link_colors_support       = isset( $color_support['link'] ) ? $color_support['link'] : false;
+        $has_button_colors_support     = isset( $color_support['button'] ) ? $color_support['button'] : false;
+        $has_heading_colors_support    = isset( $color_support['heading'] ) ? $color_support['heading'] : false;
         $has_color_support             = $has_text_colors_support ||
                 $has_background_colors_support ||
@@ -75 +82 @@
  */
 function wp_apply_colors_support( $block_type, $block_attributes ) {
-        $color_support = _wp_array_get( $block_type->supports, array( 'color' ), false );
+        $color_support = isset( $block_type->supports['color'] ) ? $block_type->supports['color'] : false;
 
         if (
@@ -84 +91 @@
         }
 
-        $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'text' ), true ) );
-        $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'background' ), true ) );
-        $has_gradients_support         = _wp_array_get( $color_support, array( 'gradients' ), false );
+        $has_text_colors_support       = true === $color_support ||
+                ( isset( $color_support['text'] ) && $color_support['text'] ) ||
+                ( is_array( $color_support ) && ! isset( $color_support['text'] ) );
+        $has_background_colors_support = true === $color_support ||
+                ( isset( $color_support['background'] ) && $color_support['background'] ) ||
+                ( is_array( $color_support ) && ! isset( $color_support['background'] ) );
+        $has_gradients_support         = isset( $color_support['gradients'] ) ? $color_support['gradients'] : false;
         $color_block_styles            = array();
 
@@ -92 +103 @@
         if ( $has_text_colors_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'text' ) ) {
                 $preset_text_color          = array_key_exists( 'textColor', $block_attributes ) ? "var:preset|color|{$block_attributes['textColor']}" : null;
-                $custom_text_color          = _wp_array_get( $block_attributes, array( 'style', 'color', 'text' ), null );
+                $custom_text_color          = isset( $block_attributes['style']['color']['text'] ) ? $block_attributes['style']['color']['text'] : null;
                 $color_block_styles['text'] = $preset_text_color ? $preset_text_color : $custom_text_color;
         }
@@ -99 +110 @@
         if ( $has_background_colors_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'background' ) ) {
                 $preset_background_color          = array_key_exists( 'backgroundColor', $block_attributes ) ? "var:preset|color|{$block_attributes['backgroundColor']}" : null;
-                $custom_background_color          = _wp_array_get( $block_attributes, array( 'style', 'color', 'background' ), null );
+                $custom_background_color          = isset( $block_attributes['style']['color']['background'] ) ? $block_attributes['style']['color']['background'] : null;
                 $color_block_styles['background'] = $preset_background_color ? $preset_background_color : $custom_background_color;
         }
@@ -106 +117 @@
         if ( $has_gradients_support && ! wp_should_skip_block_supports_serialization( $block_type, 'color', 'gradients' ) ) {
                 $preset_gradient_color          = array_key_exists( 'gradient', $block_attributes ) ? "var:preset|gradient|{$block_attributes['gradient']}" : null;
-                $custom_gradient_color          = _wp_array_get( $block_attributes, array( 'style', 'color', 'gradient' ), null );
+                $custom_gradient_color          = isset( $block_attributes['style']['color']['gradient'] ) ? $block_attributes['style']['color']['gradient'] : null;
                 $color_block_styles['gradient'] = $preset_gradient_color ? $preset_gradient_color : $custom_gradient_color;
         }