Changeset 58228

Timestamp:

05/29/2024 07:44:30 AM (5 months ago)

Author:

ellatrix

Message:

Theme JSON: Extract util to get valid block style variations.

Extracts the repeated collection of valid block style variations into a util that can be reused or updated in a single place for future work around extending block style variations.

Backports ​https://github.com/WordPress/gutenberg/pull/61030.

Props aaronrobertshaw, audrasjb.

Fixes #61121.

File:

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

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

@@ -732 +732 @@
         $valid_block_names   = array_keys( static::get_blocks_metadata() );
         $valid_element_names = array_keys( static::ELEMENTS );
-        $valid_variations    = array();
-        foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
-            if ( ! isset( $block_meta['styleVariations'] ) ) {
-                continue;
-            }
-            $valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
-        }
-        $theme_json       = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
-        $this->theme_json = static::maybe_opt_in_into_settings( $theme_json );
+        $valid_variations    = static::get_valid_block_style_variations();
+        $theme_json          = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
+        $this->theme_json    = static::maybe_opt_in_into_settings( $theme_json );
 
         // Internally, presets are keyed by origin.
@@ -3078 +3072 @@
         $valid_block_names   = array_keys( static::get_blocks_metadata() );
         $valid_element_names = array_keys( static::ELEMENTS );
-        $valid_variations    = array();
-        foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
-            if ( ! isset( $block_meta['styleVariations'] ) ) {
-                continue;
-            }
-            $valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
-        }
+        $valid_variations    = static::get_valid_block_style_variations();
 
         $theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names, $valid_variations );
@@ -4033 +4021 @@
         return implode( ',', $result );
     }
+
+    /**
+     * Collects valid block style variations keyed by block type.
+     *
+     * @since 6.6.0
+     *
+     * @return array Valid block style variations by block type.
+     */
+    protected static function get_valid_block_style_variations() {
+        $valid_variations = array();
+        foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
+            if ( ! isset( $block_meta['styleVariations'] ) ) {
+                continue;
+            }
+            $valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
+        }
+
+        return $valid_variations;
+    }
 }