vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-11 16:14:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Themes: Remove memoization from stylesheet and theme directories.

Browse Source 
This fixes bugs introduced in [56635] whereby the template or stylesheet path could be memoized incorrectly if `get_template_directory()` or `get_stylesheet_directory()` were called before the theme has been fully initialized.

Props partyfrikadelle, coreyw, kdowns, rebasaurus, meta4, flixos90, mukesh27, joemcgill.
Fixes #59847.


git-svn-id: https://develop.svn.wordpress.org/trunk@57129 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Joe McGill
2023-11-20 22:27:17 +00:00
parent 30954f7ac0
commit b6bf3553d9
9 changed files with 211 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
tests/phpunit/tests/theme.php
View File

@@ -1179,4 +1179,130 @@ class Tests_Theme extends WP_UnitTestCase {
$this->markTestSkipped( "Could not switch to $block_theme." );
}
}
/**
* Make sure filters added after the initial call are fired.
*
* @ticket 59847
*
* @covers ::get_stylesheet_directory
*/
public function test_get_stylesheet_directory_filters_apply() {
// Call the function prior to the filter being added.
get_stylesheet_directory();
$expected = 'test_root/dir';
// Add the filer.
add_filter(
'stylesheet_directory',
function () use ( $expected ) {
return $expected;
}
);
$this->assertSame( $expected, get_stylesheet_directory() );
}
/**
* Make sure filters added after the initial call are fired.
*
* @ticket 59847
*
* @covers ::get_template_directory
*/
public function test_get_template_directory_filters_apply() {
// Call the function prior to the filter being added.
get_template_directory();
$expected = 'test_root/dir';
// Add the filer.
add_filter(
'template_directory',
function () use ( $expected ) {
return $expected;
}
);
$this->assertSame( $expected, get_template_directory() );
}
/**
* Make sure get_stylesheet_directory uses the correct path when the root theme dir changes.
*
* @ticket 59847
*
* @covers ::get_stylesheet_directory
*/
public function test_get_stylesheet_directory_uses_registered_theme_dir() {
$old_theme = wp_get_theme();
switch_theme( 'test' );
$old_root = get_theme_root( 'test' );
$path1 = get_stylesheet_directory();
$new_root = DIR_TESTDATA . '/themedir2';
register_theme_directory( $new_root );
// Mock the stylesheet root option to mimic that the active root has changed.
add_filter(
'pre_option_stylesheet_root',
function () use ( $new_root ) {
return $new_root;
}
);
$path2 = get_stylesheet_directory();
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
$this->assertEquals( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
$this->assertEquals( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
}
/**
* Make sure get_template_directory uses the correct path when the root theme dir changes.
*
* @ticket 59847
*
* @covers ::get_template_directory
*/
public function test_get_template_directory_uses_registered_theme_dir() {
$old_theme = wp_get_theme();
switch_theme( 'test' );
// Mock parent theme to be returned as the template.
add_filter(
'pre_option_template',
function () {
return 'test-parent';
}
);
$old_root = get_theme_root( 'test' );
$path1 = get_template_directory();
$new_root = DIR_TESTDATA . '/themedir2';
register_theme_directory( $new_root );
// Mock the template root option to mimic that the active root has changed.
add_filter(
'pre_option_template_root',
function () use ( $new_root ) {
return $new_root;
}
);
$path2 = get_template_directory();
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
$this->assertEquals( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
$this->assertEquals( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
}
}