Changeset 58466 for trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php

Timestamp:

06/24/2024 08:49:52 AM (13 months ago)

Author:

oandregal

Message:

Section styles: improve performance and conceptual consistency.

These changes involve:

• Move shared variation definitions from styles.blocks.variations to styles.variations
• Remove blockTypes from styles.variations.
• Do not register shared variations from theme style variation or primary theme.json files.
• Move the merging of theme.json data into the WP_Theme_JSON_Resolver and WP_Theme_JSON classes.

These changes improve performance and are more future-proof API wise.
See conversation at ​https://github.com/WordPress/gutenberg/issues/62686

Props aaronrobertshaw, oandregal, andrewserong, joemcgill, talldanwp, andrewserong, ramonopoly, richtabor, youknowriad.

See #61312, #61451.

File:

• trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php (modified) (3 diffs)

trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php

@@ -610 +610 @@
      * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
      * @ticket 61312
+     * @ticket 61451
      */
     public function test_update_item_with_custom_block_style_variations() {
@@ -616 +617 @@
             grant_super_admin( self::$admin_id );
         }
+
+        /*
+         * For variations to be resolved they have to have been registered
+         * via either a theme.json partial or through the WP_Block_Styles_Registry.
+         */
+        register_block_style(
+            'core/group',
+            array(
+                'name'  => 'fromThemeStyleVariation',
+                'label' => 'From Theme Style Variation',
+            )
+        );
 
         $group_variations = array(
@@ -630 +643 @@
             array(
                 'styles' => array(
-                    'blocks' => array(
-                        'variations' => array(
-                            'fromThemeStyleVariation' => array(
-                                'blockTypes' => array( 'core/group', 'core/columns' ),
-                                'color'      => array(
-                                    'background' => '#000000',
-                                    'text'       => '#ffffff',
-                                ),
+                    'variations' => array(
+                        'fromThemeStyleVariation' => array(
+                            'blockTypes' => array( 'core/group', 'core/columns' ),
+                            'color'      => array(
+                                'background' => '#000000',
+                                'text'       => '#ffffff',
                             ),
                         ),
+                    ),
+                    'blocks'     => array(
                         'core/group' => array(
                             'variations' => $group_variations,