Rename wp_load_block_styles_on_demand_in_classic_themes() to wp_load_classic_theme_block_styles_on_demand()

Author: westonruter

src/wp-includes/default-filters.php

@@ -595,7 +595,7 @@
 add_action( 'enqueue_block_assets', 'wp_enqueue_classic_theme_styles' );
 add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
 add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
-add_action( 'init', 'wp_load_block_styles_on_demand_in_classic_themes', 8 ); // Must happen before register_core_block_style_handles() at priority 9.
+add_action( 'init', 'wp_load_classic_theme_block_styles_on_demand', 8 ); // Must happen before register_core_block_style_handles() at priority 9.
 /*
  * `wp_enqueue_registered_block_scripts_and_styles` is bound to both
  * `enqueue_block_editor_assets` and `enqueue_block_assets` hooks

src/wp-includes/script-loader.php

@@ -2264,7 +2264,7 @@ function wp_print_head_scripts() {
 /**
  * Private, for use in *_footer_scripts hooks
  *
- * In classic themes, when block styles are loaded on demand via {@see wp_load_block_styles_on_demand_in_classic_themes()},
+ * In classic themes, when block styles are loaded on demand via {@see wp_load_classic_theme_block_styles_on_demand()},
  * this function is replaced by a closure in {@see wp_hoist_late_printed_styles()} which will capture the output of
  * {@see print_late_styles()} before printing footer scripts as usual. The captured late-printed styles are then hoisted
  * to the HEAD by means of the template enhancement output buffer.
@@ -3237,7 +3237,7 @@ static function () use ( $style ) {
  * }
  */
 function wp_enqueue_stored_styles( $options = array() ) {
-	// Note: Styles printed at wp_footer for classic themes may still end up in the head due to wp_load_block_styles_on_demand_in_classic_themes().
+	// Note: Styles printed at wp_footer for classic themes may still end up in the head due to wp_load_classic_theme_block_styles_on_demand().
 	$is_block_theme   = wp_is_block_theme();
 	$is_classic_theme = ! $is_block_theme;
 
@@ -3480,7 +3480,7 @@ function wp_remove_surrounding_empty_script_tags( $contents ) {
  *
  * @since 6.9.0
  */
-function wp_load_block_styles_on_demand_in_classic_themes() {
+function wp_load_classic_theme_block_styles_on_demand() {
 	if ( wp_is_block_theme() ) {
 		return;
 	}
@@ -3514,7 +3514,7 @@ function wp_load_block_styles_on_demand_in_classic_themes() {
  *
  * @since 6.9.0
  *
- * @see wp_load_block_styles_on_demand_in_classic_themes()
+ * @see wp_load_classic_theme_block_styles_on_demand()
  * @see _wp_footer_scripts()
  */
 function wp_hoist_late_printed_styles() {

tests/phpunit/tests/dependencies/styles.php

@@ -436,7 +436,7 @@ public function test_block_styles_for_editing_without_theme_support() {
 	 * @covers ::wp_common_block_scripts_and_styles
 	 */
 	public function test_block_styles_for_editing_with_theme_support() {
-		// Override wp_load_block_styles_on_demand_in_classic_themes().
+		// Override wp_load_classic_theme_block_styles_on_demand().
 		add_filter( 'should_load_separate_core_block_assets', '__return_false' );
 
 		add_theme_support( 'wp-block-styles' );
@@ -475,7 +475,7 @@ public function test_no_block_styles_for_viewing_without_theme_support() {
 	 * @covers ::wp_common_block_scripts_and_styles
 	 */
 	public function test_block_styles_for_viewing_with_theme_support() {
-		// Override wp_load_block_styles_on_demand_in_classic_themes().
+		// Override wp_load_classic_theme_block_styles_on_demand().
 		add_filter( 'should_load_separate_core_block_assets', '__return_false' );
 
 		add_theme_support( 'wp-block-styles' );

tests/phpunit/tests/template.php

@@ -97,7 +97,7 @@ public function set_up() {
 		);
 		$this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-		// Remove hooks which are added by wp_load_block_styles_on_demand_in_classic_themes() during bootstrapping.
+		// Remove hooks which are added by wp_load_classic_theme_block_styles_on_demand() during bootstrapping.
 		remove_filter( 'wp_should_output_buffer_template_for_enhancement', '__return_true', 0 );
 		remove_filter( 'should_load_separate_core_block_assets', '__return_true', 0 );
 		remove_filter( 'should_load_block_assets_on_demand', '__return_true', 0 );
@@ -536,11 +536,11 @@ public function test_locate_template_uses_current_theme() {
 	 * @ticket 64099
 	 * @covers ::wp_should_output_buffer_template_for_enhancement
 	 * @covers ::wp_start_template_enhancement_output_buffer
-	 * @covers ::wp_load_block_styles_on_demand_in_classic_themes
+	 * @covers ::wp_load_classic_theme_block_styles_on_demand
 	 */
 	public function test_wp_start_template_enhancement_output_buffer_without_filters_and_no_override_in_block_theme(): void {
 		switch_theme( 'block-theme' );
-		wp_load_block_styles_on_demand_in_classic_themes();
+		wp_load_classic_theme_block_styles_on_demand();
 
 		$level = ob_get_level();
 		$this->assertFalse( wp_should_output_buffer_template_for_enhancement(), 'Expected wp_should_output_buffer_template_for_enhancement() to return false when there are no wp_template_enhancement_output_buffer filters added.' );
@@ -556,14 +556,14 @@ public function test_wp_start_template_enhancement_output_buffer_without_filters
 	 * @ticket 64099
 	 * @covers ::wp_should_output_buffer_template_for_enhancement
 	 * @covers ::wp_start_template_enhancement_output_buffer
-	 * @covers ::wp_load_block_styles_on_demand_in_classic_themes
+	 * @covers ::wp_load_classic_theme_block_styles_on_demand
 	 */
 	public function test_wp_start_template_enhancement_output_buffer_in_classic_theme(): void {
 		switch_theme( 'default' );
-		wp_load_block_styles_on_demand_in_classic_themes();
+		wp_load_classic_theme_block_styles_on_demand();
 
 		$level = ob_get_level();
-		$this->assertTrue( wp_should_output_buffer_template_for_enhancement(), 'Expected wp_should_output_buffer_template_for_enhancement() to return true because wp_load_block_styles_on_demand_in_classic_themes() adds wp_template_enhancement_output_buffer filters.' );
+		$this->assertTrue( wp_should_output_buffer_template_for_enhancement(), 'Expected wp_should_output_buffer_template_for_enhancement() to return true because wp_load_classic_theme_block_styles_on_demand() adds wp_template_enhancement_output_buffer filters.' );
 		$this->assertTrue( wp_start_template_enhancement_output_buffer(), 'Expected wp_start_template_enhancement_output_buffer() to return true because the output buffer should be started.' );
 		$this->assertSame( 1, did_action( 'wp_template_enhancement_output_buffer_started' ), 'Expected the wp_template_enhancement_output_buffer_started action to have fired.' );
 		$this->assertSame( $level + 1, ob_get_level(), 'Expected the initial output buffer level to be incremented by one.' );
@@ -894,52 +894,52 @@ public function test_wp_start_template_enhancement_output_buffer_for_json(): voi
 	}
 
 	/**
-	 * Tests that wp_load_block_styles_on_demand_in_classic_themes() does not add hooks for block themes.
+	 * Tests that wp_load_classic_theme_block_styles_on_demand() does not add hooks for block themes.
 	 *
 	 * @ticket 64099
-	 * @covers ::wp_load_block_styles_on_demand_in_classic_themes
+	 * @covers ::wp_load_classic_theme_block_styles_on_demand
 	 */
-	public function test_wp_load_block_styles_on_demand_in_classic_themes_in_block_theme(): void {
+	public function test_wp_load_classic_theme_block_styles_on_demand_in_block_theme(): void {
 		switch_theme( 'block-theme' );
 
-		wp_load_block_styles_on_demand_in_classic_themes();
+		wp_load_classic_theme_block_styles_on_demand();
 
 		$this->assertFalse( has_filter( 'should_load_separate_core_block_assets' ), 'Expect should_load_separate_core_block_assets filter NOT to be added for block themes.' );
 		$this->assertFalse( has_filter( 'should_load_block_assets_on_demand', '__return_true' ), 'Expect should_load_block_assets_on_demand filter NOT to be added for block themes.' );
 		$this->assertFalse( has_action( 'wp_template_enhancement_output_buffer_started', 'wp_hoist_late_printed_styles' ), 'Expect wp_template_enhancement_output_buffer_started action NOT to be added for block themes.' );
 	}
 
 	/**
-	 * Tests that wp_load_block_styles_on_demand_in_classic_themes() does not add hooks for classic themes when output buffering is blocked.
+	 * Tests that wp_load_classic_theme_block_styles_on_demand() does not add hooks for classic themes when output buffering is blocked.
 	 *
 	 * @ticket 64099
-	 * @covers ::wp_load_block_styles_on_demand_in_classic_themes
+	 * @covers ::wp_load_classic_theme_block_styles_on_demand
 	 */
-	public function test_wp_load_block_styles_on_demand_in_classic_themes_in_classic_theme_but_output_buffering_blocked(): void {
+	public function test_wp_load_classic_theme_block_styles_on_demand_in_classic_theme_but_output_buffering_blocked(): void {
 		add_filter( 'wp_should_output_buffer_template_for_enhancement', '__return_false' );
 		switch_theme( 'default' );
 
-		wp_load_block_styles_on_demand_in_classic_themes();
+		wp_load_classic_theme_block_styles_on_demand();
 
 		$this->assertFalse( has_filter( 'should_load_separate_core_block_assets' ), 'Expect should_load_separate_core_block_assets filter NOT to be added for block themes.' );
 		$this->assertFalse( has_filter( 'should_load_block_assets_on_demand', '__return_true' ), 'Expect should_load_block_assets_on_demand filter NOT to be added for block themes.' );
 		$this->assertFalse( has_action( 'wp_template_enhancement_output_buffer_started', 'wp_hoist_late_printed_styles' ), 'Expect wp_template_enhancement_output_buffer_started action NOT to be added for block themes.' );
 	}
 
 	/**
-	 * Tests that wp_load_block_styles_on_demand_in_classic_themes() adds the expected hooks for classic themes.
+	 * Tests that wp_load_classic_theme_block_styles_on_demand() adds the expected hooks for classic themes.
 	 *
 	 * @ticket 64099
-	 * @covers ::wp_load_block_styles_on_demand_in_classic_themes
+	 * @covers ::wp_load_classic_theme_block_styles_on_demand
 	 */
-	public function test_wp_load_block_styles_on_demand_in_classic_themes_in_classic_theme(): void {
+	public function test_wp_load_classic_theme_block_styles_on_demand_in_classic_theme(): void {
 		switch_theme( 'default' );
 
 		$this->assertFalse( wp_should_load_separate_core_block_assets(), 'Expected wp_should_load_separate_core_block_assets() to return false initially.' );
 		$this->assertFalse( wp_should_load_block_assets_on_demand(), 'Expected wp_should_load_block_assets_on_demand() to return true' );
 		$this->assertFalse( has_action( 'wp_template_enhancement_output_buffer_started', 'wp_hoist_late_printed_styles' ), 'Expected wp_template_enhancement_output_buffer_started action to be added for classic themes.' );
 
-		wp_load_block_styles_on_demand_in_classic_themes();
+		wp_load_classic_theme_block_styles_on_demand();
 
 		$this->assertTrue( wp_should_load_separate_core_block_assets(), 'Expected wp_should_load_separate_core_block_assets() filters to return true' );
 		$this->assertTrue( wp_should_load_block_assets_on_demand(), 'Expected wp_should_load_block_assets_on_demand() to return true' );

tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php

@@ -291,7 +291,7 @@ public function test_third_party_blocks_inline_styles_get_rendered_when_per_bloc
 	 * @covers ::wp_add_global_styles_for_blocks
 	 */
 	public function test_blocks_inline_styles_get_rendered() {
-		// Override wp_load_block_styles_on_demand_in_classic_themes().
+		// Override wp_load_classic_theme_block_styles_on_demand().
 		add_filter( 'should_load_block_assets_on_demand', '__return_false' ); // Needed for the .wp-block-post-featured-image assertion below.
 
 		$this->set_up_third_party_block();