vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-02 00:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade/Install: Skip registering theme block patterns during the upgrade process.

Browse Source 
This fixes a bug during the database upgrade process where a theme's `functions.php` file may not be loaded, leading to potential exceptions if the theme's pattern files use symbols (classes, functions, constants, etc.) that are declared only when the `functions.php` file is loaded. To do so, a check for `wp_get_active_and_valid_themes()` is added early to `_register_theme_block_patterns()`, which returns early if no active or valid themes are returned.

Props fabiankaegy, rajinsharwar, pbiron, huzaifaalmesbah, hellofromTonya, peterwilsoncc, joemcgill.
Fixes #59723.


git-svn-id: https://develop.svn.wordpress.org/trunk@57021 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Joe McGill
2023-10-27 19:02:54 +00:00
parent 22e32d8993
commit ea30b5d8eb
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php
View File

@@ -482,4 +482,68 @@ class Tests_Blocks_wpBlockPattersRegistry extends WP_UnitTestCase {
$result = $this->registry->is_registered( 'test/one' );
$this->assertTrue( $result );
}
/**
* Ensures theme patterns are registered on init.
*
* @ticket 59723
*
* @covers ::_register_theme_block_patterns
*/
public function test_register_theme_block_patterns_on_init() {
// This test needs to use access static class properties.
$registry = WP_Block_Patterns_Registry::get_instance();
// Ensure we're using a theme with patterns.
switch_theme( 'twentytwentythree' );
$theme = wp_get_theme();
$theme_patterns = array_values( wp_list_pluck( $theme->get_block_patterns(), 'slug' ) );
// This helper is fired on the init hook.
_register_theme_block_patterns();
$registered = wp_list_pluck( $registry->get_all_registered(), 'name' );
// Cleanup patterns registry.
foreach ( $theme_patterns as $pattern ) {
$registry->unregister( $pattern );
}
$this->assertSameSets( $theme_patterns, array_intersect( $theme_patterns, $registered ), 'Could not confirm theme patterns were registered.' );
}
/**
* Ensures theme patterns are not registered when no themes are active and valid.
*
* @ticket 59723
*
* @covers ::_register_theme_block_patterns
*/
public function test_register_theme_block_patterns_on_init_skipped_during_install() {
// This test needs to use access static class properties.
$registry = WP_Block_Patterns_Registry::get_instance();
// Ensure we're using a theme with patterns.
switch_theme( 'twentytwentythree' );
$theme = wp_get_theme();
$theme_patterns = array_values( wp_list_pluck( $theme->get_block_patterns(), 'slug' ) );
/*
* This will short-circuit theme activation.
* @see wp_get_active_and_valid_themes().
*/
wp_installing( true );
// This helper is fired on the init hook.
_register_theme_block_patterns();
$registered = wp_list_pluck( $registry->get_all_registered(), 'name' );
// Cleanup.
wp_installing( false );
$this->assertEmpty( array_intersect( $theme_patterns, $registered ), 'Theme patterns were were incorrectly registered.' );
}
}