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

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

@@ -415 +415 @@
 
             foreach ( $gap_sides as $gap_side ) {
-                $process_value = is_string( $gap_value ) ? $gap_value : _wp_array_get( $gap_value, array( $gap_side ), $fallback_gap_value );
+                $process_value = $gap_value;
+                if ( is_array( $gap_value ) ) {
+                    $process_value = isset( $gap_value[ $gap_side ] ) ? $gap_value[ $gap_side ] : $fallback_gap_value;
+                }
                 // Get spacing CSS variable from preset value if provided.
                 if ( is_string( $process_value ) && str_contains( $process_value, 'var:preset|spacing|' ) ) {
@@ -496 +499 @@
 
             foreach ( $gap_sides as $gap_side ) {
-                $process_value = is_string( $gap_value ) ? $gap_value : _wp_array_get( $gap_value, array( $gap_side ), $fallback_gap_value );
+                $process_value = $gap_value;
+                if ( is_array( $gap_value ) ) {
+                    $process_value = isset( $gap_value[ $gap_side ] ) ? $gap_value[ $gap_side ] : $fallback_gap_value;
+                }
                 // Get spacing CSS variable from preset value if provided.
                 if ( is_string( $process_value ) && str_contains( $process_value, 'var:preset|spacing|' ) ) {
@@ -613 +619 @@
 
     $global_settings = wp_get_global_settings();
-    $fallback_layout = ! empty( _wp_array_get( $block_type->supports, array( 'layout', 'default' ), array() ) ) ? _wp_array_get( $block_type->supports, array( 'layout', 'default' ), array() ) : _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
-    $used_layout     = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $fallback_layout;
+    $fallback_layout = isset( $block_type->supports['layout']['default'] )
+        ? $block_type->supports['layout']['default']
+        : array();
+    if ( empty( $fallback_layout ) ) {
+        $fallback_layout = isset( $block_type->supports['__experimentalLayout']['default'] )
+            ? $block_type->supports['__experimentalLayout']['default']
+            : array();
+    }
+    $used_layout = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $fallback_layout;
 
     $class_names        = array();
@@ -625 +638 @@
     }
 
-    $root_padding_aware_alignments = _wp_array_get( $global_settings, array( 'useRootPaddingAwareAlignments' ), false );
+    $root_padding_aware_alignments = isset( $global_settings['useRootPaddingAwareAlignments'] )
+        ? $global_settings['useRootPaddingAwareAlignments']
+        : false;
 
     if (
@@ -655 +670 @@
     // Get classname for layout type.
     if ( isset( $used_layout['type'] ) ) {
-        $layout_classname = _wp_array_get( $layout_definitions, array( $used_layout['type'], 'className' ), '' );
+        $layout_classname = isset( $layout_definitions[ $used_layout['type'] ]['className'] )
+            ? $layout_definitions[ $used_layout['type'] ]['className']
+            : '';
     } else {
-        $layout_classname = _wp_array_get( $layout_definitions, array( 'default', 'className' ), '' );
+        $layout_classname = isset( $layout_definitions['default']['className'] )
+            ? $layout_definitions['default']['className']
+            : '';
     }
 
@@ -670 +689 @@
     if ( ! current_theme_supports( 'disable-layout-styles' ) ) {
 
-        $gap_value = _wp_array_get( $block, array( 'attrs', 'style', 'spacing', 'blockGap' ) );
+        $gap_value = isset( $block['attrs']['style']['spacing']['blockGap'] )
+            ? $block['attrs']['style']['spacing']['blockGap']
+            : null;
         /*
          * Skip if gap value contains unsupported characters.
@@ -684 +705 @@
         }
 
-        $fallback_gap_value = _wp_array_get( $block_type->supports, array( 'spacing', 'blockGap', '__experimentalDefault' ), '0.5em' );
-        $block_spacing      = _wp_array_get( $block, array( 'attrs', 'style', 'spacing' ), null );
+        $fallback_gap_value = isset( $block_type->supports['spacing']['blockGap']['__experimentalDefault'] )
+            ? $block_type->supports['spacing']['blockGap']['__experimentalDefault']
+            : '0.5em';
+        $block_spacing      = isset( $block['attrs']['style']['spacing'] )
+            ? $block['attrs']['style']['spacing']
+            : null;
 
         /*
@@ -693 +718 @@
         $should_skip_gap_serialization = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'blockGap' );
 
-        $block_gap             = _wp_array_get( $global_settings, array( 'spacing', 'blockGap' ), null );
+        $block_gap             = isset( $global_settings['spacing']['blockGap'] )
+            ? $global_settings['spacing']['blockGap']
+            : null;
         $has_block_gap_support = isset( $block_gap );