unregster bug fix

Author: kt-12

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

@@ -1000,6 +1000,14 @@ protected static function get_blocks_metadata() {
 		$registry = WP_Block_Type_Registry::get_instance();
 		$blocks   = $registry->get_all_registered();
 
+		// Unset old blocks from static variable.
+		$blocks_to_unset = array_diff_key( static::$blocks_metadata, $blocks );
+		if ( ! empty( $blocks_to_unset ) ) {
+			foreach ( $blocks_to_unset as $block_name => $block_meta ) {
+				unset( static::$blocks_metadata[ $block_name ] );
+			}
+		}
+
 		// Is there metadata for all currently registered blocks?
 		$blocks = array_diff_key( $blocks, static::$blocks_metadata );
 		if ( empty( $blocks ) ) {

tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php

@@ -20,6 +20,7 @@ class Tests_Theme_WpAddGlobalStylesForBlocks extends WP_Theme_UnitTestCase {
 
 	public function set_up() {
 		parent::set_up();
+		switch_theme( 'default' );
 		remove_action( 'wp_print_styles', 'print_emoji_styles' );
 	}
 
@@ -32,6 +33,7 @@ public function tear_down() {
 			$this->test_blocks = array();
 		}
 
+		switch_theme( 'default' );
 		parent::tear_down();
 	}
 
@@ -126,6 +128,7 @@ public function test_styles_for_blocks_skips_cache_in_dev_mode() {
 	 * @ticket 59595
 	 */
 	public function test_styles_for_blocks_cache_is_skipped() {
+		switch_theme( 'block-theme' );
 		wp_register_style( 'global-styles', false, array(), true, true );
 
 		// Initial register of global styles.
@@ -136,15 +139,14 @@ public function test_styles_for_blocks_cache_is_skipped() {
 		$this->assertNotEmpty( $styles_for_blocks_initial, 'Initial cache was not set.' );
 
 		$this->set_up_third_party_block();
-
 		/*
 		 * Call register of global styles again to ensure the cache is updated.
 		 * In normal conditions, this function is only called once per request.
 		 */
 		wp_add_global_styles_for_blocks();
 
-		$cache_key                 = $this->get_wp_styles_for_blocks_cache_key();
-		$styles_for_blocks_updated = get_site_transient( $cache_key );
+		$cache_key_new             = $this->get_wp_styles_for_blocks_cache_key();
+		$styles_for_blocks_updated = get_site_transient( $cache_key_new );
 		$this->assertNotEmpty( $styles_for_blocks_updated, 'Updated cache was not set.' );
 
 		$this->assertNotEquals(