Move redundant and uncomprehensive calls to WP_Style_Engine_CSS_Rules_Store::remove_all_stores() to base tear_down method

Author: westonruter

src/wp-includes/script-loader.php

@@ -3232,7 +3232,8 @@ static function () use ( $style ) {
  * }
  */
 function wp_enqueue_stored_styles( $options = array() ) {
-	$is_block_theme   = wp_is_block_theme(); // TODO: Shouldn't this rather check wp_should_load_block_assets_on_demand()? It should be something like $is_printing_styles_late.
+	// 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().
+	$is_block_theme   = wp_is_block_theme();
 	$is_classic_theme = ! $is_block_theme;
 
 	/*

tests/phpunit/includes/abstract-testcase.php

@@ -218,6 +218,8 @@ public function tear_down() {
 		wp_set_current_user( 0 );
 
 		$this->reset_lazyload_queue();
+
+		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 	}
 
 	/**

tests/phpunit/tests/block-supports/duotone.php

@@ -9,13 +9,6 @@
  */
 
 class Tests_Block_Supports_Duotone extends WP_UnitTestCase {
-	/**
-	 * Cleans up CSS added to block-supports from duotone styles. We need to do this
-	 * in order to avoid impacting other tests.
-	 */
-	public static function wpTearDownAfterClass() {
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
-	}
 
 	/**
 	 * Tests whether the duotone preset class is added to the block.

tests/phpunit/tests/block-supports/wpRenderBackgroundSupport.php

@@ -40,7 +40,6 @@ public function set_up() {
 		// Clear caches.
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 	}
 
 	public function tear_down() {
@@ -53,7 +52,6 @@ public function tear_down() {
 
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::tear_down();

tests/phpunit/tests/block-supports/wpRenderDimensionsSupport.php

@@ -40,7 +40,6 @@ public function set_up() {
 		// Clear caches.
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 	}
 
 	public function tear_down() {
@@ -53,7 +52,6 @@ public function tear_down() {
 
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::tear_down();

tests/phpunit/tests/block-supports/wpRenderElementsSupport.php

@@ -12,7 +12,6 @@ class Tests_Block_Supports_WpRenderElementsSupport extends WP_UnitTestCase {
 	private $test_block_name;
 
 	public function tear_down() {
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::tear_down();

tests/phpunit/tests/block-supports/wpRenderElementsSupportStyles.php

@@ -12,7 +12,6 @@ class Tests_Block_Supports_WpRenderElementsSupportStyles extends WP_UnitTestCase
 	private $test_block_name;
 
 	public function tear_down() {
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::tear_down();

tests/phpunit/tests/block-supports/wpRenderPositionSupport.php

@@ -41,7 +41,6 @@ public function set_up() {
 		// Clear caches.
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 	}
 
 	public function tear_down() {
@@ -54,7 +53,6 @@ public function tear_down() {
 
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::tear_down();

tests/phpunit/tests/style-engine/styleEngine.php

@@ -13,13 +13,6 @@
  * Tests for registering, storing and generating styles.
  */
 class Tests_wpStyleEngine extends WP_UnitTestCase {
-	/**
-	 * Cleans up stores after each test.
-	 */
-	public function tear_down() {
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
-		parent::tear_down();
-	}
 
 	/**
 	 * Tests generating block styles and classnames based on various manifestations of the $block_styles argument.

tests/phpunit/tests/style-engine/wpStyleEngineCssRulesStore.php

@@ -15,13 +15,6 @@
  * @coversDefaultClass WP_Style_Engine_CSS_Rules_Store
  */
 class Tests_Style_Engine_wpStyleEngineCSSRulesStore extends WP_UnitTestCase {
-	/**
-	 * Cleans up stores after each test.
-	 */
-	public function tear_down() {
-		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
-		parent::tear_down();
-	}
 
 	/**
 	 * Tests creating a new store on instantiation.