From 90a7ecc47472664baef43935718471bf9e08cfac Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Tue, 11 Oct 2022 20:06:16 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@54501 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-theme-json-resolver.php | 10 +++++----- src/wp-includes/class-wp-theme-json.php | 2 +- src/wp-includes/script-loader.php | 2 +- tests/phpunit/tests/theme/wpThemeJsonResolver.php | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php index 6b2695fe48..993543a55b 100644 --- a/src/wp-includes/class-wp-theme-json-resolver.php +++ b/src/wp-includes/class-wp-theme-json-resolver.php @@ -180,7 +180,7 @@ class WP_Theme_JSON_Resolver { * * @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' ); @@ -256,7 +256,7 @@ class WP_Theme_JSON_Resolver { * * @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 ); } @@ -357,7 +357,7 @@ class WP_Theme_JSON_Resolver { * * @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(); static::$blocks = new WP_Theme_JSON( $config, 'blocks' ); @@ -490,7 +490,7 @@ class WP_Theme_JSON_Resolver { * * @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' ); } @@ -508,7 +508,7 @@ class WP_Theme_JSON_Resolver { } /** 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' ); diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php index 81d471b5d4..555898370f 100644 --- a/src/wp-includes/class-wp-theme-json.php +++ b/src/wp-includes/class-wp-theme-json.php @@ -1911,7 +1911,7 @@ class WP_Theme_JSON { * * @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 ); } /** diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 5d842f5787..6f844cbc7e 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2429,7 +2429,7 @@ function wp_enqueue_global_styles() { * This removes the CSS from the global-styles stylesheet and adds it to the inline CSS for each block. * 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(); diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php index bbfffde317..5174b04a9f 100644 --- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php +++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php @@ -390,13 +390,13 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { static::$property_blocks_cache->setValue( null, $blocks_cache ); } - $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 ) { $expected_filter_count++; } - $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()' ); }