Changeset 54501

Timestamp:

10/11/2022 08:06:16 PM (2 years ago)

Author:

hellofromTonya

Message:

Editor: Rename new theme_json_{$context} filters.

The newly introduced filters are renamed to use the wp_theme_json_data{$context} structure:

• theme_json_default renamed to wp_theme_json_data_default
• theme_json_theme renamed to wp_theme_json_data_theme
• theme_json_blocks renamed to wp_theme_json_data_blocks
• theme_json_user renamed to wp_theme_json_data_user

The following new filter gets the wp_ prefix added:

• theme_json_get_style_nodes renamed to wp_theme_json_get_style_nodes

Follow-up to [56467], [54183], [54118].

Props kebbet, desrosj, mukesh27, ocean90, sergeybiryukov, davidbaumwald, hellofromTonya.
Fixes #56796.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme-json-resolver.php (modified) (5 diffs)
• src/wp-includes/class-wp-theme-json.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpThemeJsonResolver.php (modified) (2 diffs)

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

@@ -181 +181 @@
          * @param WP_Theme_JSON_Data Class to access and update the underlying data.
          */
-        $theme_json   = apply_filters( 'theme_json_default', new WP_Theme_JSON_Data( $config, 'default' ) );
+        $theme_json   = apply_filters( 'wp_theme_json_data_default', new WP_Theme_JSON_Data( $config, 'default' ) );
         $config       = $theme_json->get_data();
         static::$core = new WP_Theme_JSON( $config, 'default' );
@@ -257 +257 @@
              * @param WP_Theme_JSON_Data Class to access and update the underlying data.
              */
-            $theme_json      = apply_filters( 'theme_json_theme', new WP_Theme_JSON_Data( $theme_json_data, 'theme' ) );
+            $theme_json      = apply_filters( 'wp_theme_json_data_theme', new WP_Theme_JSON_Data( $theme_json_data, 'theme' ) );
             $theme_json_data = $theme_json->get_data();
             static::$theme   = new WP_Theme_JSON( $theme_json_data );
@@ -358 +358 @@
          * @param WP_Theme_JSON_Data Class to access and update the underlying data.
          */
-        $theme_json = apply_filters( 'theme_json_blocks', new WP_Theme_JSON_Data( $config, 'blocks' ) );
+        $theme_json = apply_filters( 'wp_theme_json_data_blocks', new WP_Theme_JSON_Data( $config, 'blocks' ) );
         $config     = $theme_json->get_data();
 
@@ -491 +491 @@
                  * @param WP_Theme_JSON_Data Class to access and update the underlying data.
                  */
-                $theme_json = apply_filters( 'theme_json_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
+                $theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
                 $config     = $theme_json->get_data();
                 return new WP_Theme_JSON( $config, 'custom' );
@@ -509 +509 @@
 
         /** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */
-        $theme_json   = apply_filters( 'theme_json_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
+        $theme_json   = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
         $config       = $theme_json->get_data();
         static::$user = new WP_Theme_JSON( $config, 'custom' );

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

@@ -1912 +1912 @@
          * @param array $nodes Style nodes with metadata.
          */
-        return apply_filters( 'theme_json_get_style_nodes', $nodes );
+        return apply_filters( 'wp_theme_json_get_style_nodes', $nodes );
     }
 

trunk/src/wp-includes/script-loader.php

@@ -2430 +2430 @@
      * This filter must be registered before calling wp_get_global_stylesheet();
      */
-    add_filter( 'theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
+    add_filter( 'wp_theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
 
     $stylesheet = wp_get_global_stylesheet();

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -391 +391 @@
         }
 
-        $expected_filter_count = did_filter( 'theme_json_default' );
+        $expected_filter_count = did_filter( 'wp_theme_json_data_default' );
         $actual                = WP_Theme_JSON_Resolver::get_core_data();
         if ( $should_fire_filter ) {
@@ -397 +397 @@
         }
 
-        $this->assertSame( $expected_filter_count, did_filter( 'theme_json_default' ), 'The filter "theme_json_default" should fire the given number of times' );
+        $this->assertSame( $expected_filter_count, did_filter( 'wp_theme_json_data_default' ), 'The filter "theme_json_default" should fire the given number of times' );
         $this->assertInstanceOf( WP_Theme_JSON::class, $actual, 'WP_Theme_JSON_Resolver::get_core_data() should return instance of WP_Theme_JSON' );
         $this->assertSame( static::$property_core->getValue(), $actual, 'WP_Theme_JSON_Resolver::$core property should be the same object as returned from WP_Theme_JSON_Resolver::get_core_data()' );