Changeset 59359

Timestamp:

11/06/2024 12:42:12 AM (4 weeks ago)

Author:

ramonopoly

Message:

Performance: reuse block metadata in WP_Theme_JSON::get_valid_block_style_variations()

In WP_Theme_JSON::get_valid_block_style_variations(), the method was calling self::get_blocks_metadata() even though the metadata was already retrieved in the parent function. This update reuses the existing block metadata instead of calling it again.

A new optional parameter, $blocks_metadata, has been added to the function, allowing it to use pre-fetched metadata when available, improving efficiency.

Fewer self::get_blocks_metadata() calls mean faster processing, especially in themes with many blocks.

Props mukesh27, ramonopoly, aaronrobertshaw, flixos90.
Fixes #62291.

File:

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

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

@@ -758 +758 @@
 
         $this->theme_json    = WP_Theme_JSON_Schema::migrate( $theme_json, $origin );
-        $valid_block_names   = array_keys( static::get_blocks_metadata() );
+        $blocks_metadata     = static::get_blocks_metadata();
+        $valid_block_names   = array_keys( $blocks_metadata );
         $valid_element_names = array_keys( static::ELEMENTS );
-        $valid_variations    = static::get_valid_block_style_variations();
+        $valid_variations    = static::get_valid_block_style_variations( $blocks_metadata );
         $this->theme_json    = static::unwrap_shared_block_style_variations( $this->theme_json, $valid_variations );
         $this->theme_json    = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
@@ -3483 +3484 @@
         $theme_json = WP_Theme_JSON_Schema::migrate( $theme_json, $origin );
 
-        $valid_block_names   = array_keys( static::get_blocks_metadata() );
+        $blocks_metadata     = static::get_blocks_metadata();
+        $valid_block_names   = array_keys( $blocks_metadata );
         $valid_element_names = array_keys( static::ELEMENTS );
-        $valid_variations    = static::get_valid_block_style_variations();
+        $valid_variations    = static::get_valid_block_style_variations( $blocks_metadata );
 
         $theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names, $valid_variations );
@@ -4532 +4534 @@
      *
      * @since 6.6.0
-     *
+     * @since 6.8.0 Added the `$blocks_metadata` parameter.
+     *
+     * @param array $blocks_metadata Optional. List of metadata per block. Default is the metadata for all blocks.
      * @return array Valid block style variations by block type.
      */
-    protected static function get_valid_block_style_variations() {
+    protected static function get_valid_block_style_variations( $blocks_metadata = array() ) {
         $valid_variations = array();
-        foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
+        $blocks_metadata  = empty( $blocks_metadata ) ? static::get_blocks_metadata() : $blocks_metadata;
+        foreach ( $blocks_metadata as $block_name => $block_meta ) {
             if ( ! isset( $block_meta['styleVariations'] ) ) {
                 continue;