Changeset 56709 for trunk/src/wp-includes/block-supports/typography.php

Timestamp:

09/26/2023 01:45:23 PM (22 months 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/typography.php (modified) (5 diffs)

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

@@ -21 +21 @@
     }
 
-    $typography_supports = _wp_array_get( $block_type->supports, array( 'typography' ), false );
+    $typography_supports = isset( $block_type->supports['typography'] ) ? $block_type->supports['typography'] : false;
     if ( ! $typography_supports ) {
         return;
     }
 
-    $has_font_family_support     = _wp_array_get( $typography_supports, array( '__experimentalFontFamily' ), false );
-    $has_font_size_support       = _wp_array_get( $typography_supports, array( 'fontSize' ), false );
-    $has_font_style_support      = _wp_array_get( $typography_supports, array( '__experimentalFontStyle' ), false );
-    $has_font_weight_support     = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
-    $has_letter_spacing_support  = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
-    $has_line_height_support     = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
-    $has_text_columns_support    = _wp_array_get( $typography_supports, array( 'textColumns' ), false );
-    $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
-    $has_text_transform_support  = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
-    $has_writing_mode_support    = _wp_array_get( $typography_supports, array( '__experimentalWritingMode' ), false );
+    $has_font_family_support     = isset( $typography_supports['__experimentalFontFamily'] ) ? $typography_supports['__experimentalFontFamily'] : false;
+    $has_font_size_support       = isset( $typography_supports['fontSize'] ) ? $typography_supports['fontSize'] : false;
+    $has_font_style_support      = isset( $typography_supports['__experimentalFontStyle'] ) ? $typography_supports['__experimentalFontStyle'] : false;
+    $has_font_weight_support     = isset( $typography_supports['__experimentalFontWeight'] ) ? $typography_supports['__experimentalFontWeight'] : false;
+    $has_letter_spacing_support  = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] : false;
+    $has_line_height_support     = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] : false;
+    $has_text_columns_support    = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] : false;
+    $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] : false;
+    $has_text_transform_support  = isset( $typography_supports['__experimentalTextTransform'] ) ? $typography_supports['__experimentalTextTransform'] : false;
+    $has_writing_mode_support    = isset( $typography_supports['__experimentalWritingMode'] ) ? $typography_supports['__experimentalWritingMode'] : false;
 
     $has_typography_support = $has_font_family_support
@@ -90 +90 @@
     }
 
-    $typography_supports = _wp_array_get( $block_type->supports, array( 'typography' ), false );
+    $typography_supports = isset( $block_type->supports['typography'] )
+        ? $block_type->supports['typography']
+        : false;
     if ( ! $typography_supports ) {
         return array();
@@ -99 +101 @@
     }
 
-    $has_font_family_support     = _wp_array_get( $typography_supports, array( '__experimentalFontFamily' ), false );
-    $has_font_size_support       = _wp_array_get( $typography_supports, array( 'fontSize' ), false );
-    $has_font_style_support      = _wp_array_get( $typography_supports, array( '__experimentalFontStyle' ), false );
-    $has_font_weight_support     = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
-    $has_letter_spacing_support  = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
-    $has_line_height_support     = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
-    $has_text_columns_support    = _wp_array_get( $typography_supports, array( 'textColumns' ), false );
-    $has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
-    $has_text_transform_support  = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
-    $has_writing_mode_support    = _wp_array_get( $typography_supports, array( '__experimentalWritingMode' ), false );
+    $has_font_family_support     = isset( $typography_supports['__experimentalFontFamily'] ) ? $typography_supports['__experimentalFontFamily'] : false;
+    $has_font_size_support       = isset( $typography_supports['fontSize'] ) ? $typography_supports['fontSize'] : false;
+    $has_font_style_support      = isset( $typography_supports['__experimentalFontStyle'] ) ? $typography_supports['__experimentalFontStyle'] : false;
+    $has_font_weight_support     = isset( $typography_supports['__experimentalFontWeight'] ) ? $typography_supports['__experimentalFontWeight'] : false;
+    $has_letter_spacing_support  = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] : false;
+    $has_line_height_support     = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] : false;
+    $has_text_columns_support    = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] : false;
+    $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] : false;
+    $has_text_transform_support  = isset( $typography_supports['__experimentalTextTransform'] ) ? $typography_supports['__experimentalTextTransform'] : false;
+    $has_writing_mode_support    = isset( $typography_supports['__experimentalWritingMode'] ) ? $typography_supports['__experimentalWritingMode'] : false;
 
     // Whether to skip individual block support features.
@@ -170 +172 @@
 
     if ( $has_line_height_support && ! $should_skip_line_height ) {
-        $typography_block_styles['lineHeight'] = _wp_array_get( $block_attributes, array( 'style', 'typography', 'lineHeight' ) );
+        $typography_block_styles['lineHeight'] = isset( $block_attributes['style']['typography']['lineHeight'] )
+            ? $block_attributes['style']['typography']['lineHeight']
+            : null;
     }
 
     if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) {
-        $typography_block_styles['textColumns'] = _wp_array_get( $block_attributes, array( 'style', 'typography', 'textColumns' ), null );
+        $typography_block_styles['textColumns'] = isset( $block_attributes['style']['typography']['textColumns'] )
+            ? $block_attributes['style']['typography']['textColumns']
+            : null;
     }
 
@@ -214 +220 @@
         isset( $block_attributes['style']['typography']['writingMode'] )
     ) {
-        $typography_block_styles['writingMode'] = _wp_array_get(
-            $block_attributes,
-            array( 'style', 'typography', 'writingMode' ),
-            null
-        );
+        $typography_block_styles['writingMode'] = isset( $block_attributes['style']['typography']['writingMode'] )
+            ? $block_attributes['style']['typography']['writingMode']
+            : null;
     }