mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-21 07:02:30 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Block Hooks: Remove filter global reset from test teardown.

Browse Source 
Resetting the `$wp_current_filter` global during test teardown is unnecessary, as it is taken care of by the unit test's base class.

This changeset removes the reset accordingly.

Follow-up [57790].

Reviewed by swissspidy.
Merges [57799] to the to the 6.5 branch.

Props swissspidy, timothyblynjacobs.
See #60671.

git-svn-id: https://develop.svn.wordpress.org/branches/6.5@57803 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
bernhard-reiter 2024-03-11 14:15:58 +00:00
parent 12656dd226
commit d289e7500e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/phpunit/tests/block-template-utils.php
View File

@ -92,15 +92,6 @@ class Tests_Block_Template_Utils extends WP_UnitTestCase {
* @since 6.5.0
*/
public function tear_down() {
global $wp_current_filter;
if (
'rest_pre_insert_wp_template' === current_filter() ||
'rest_pre_insert_wp_template_part' === current_filter()
) {
array_pop( $wp_current_filter );
}
if ( WP_Block_Type_Registry::get_instance()->is_registered( 'tests/hooked-block' ) ) {
unregister_block_type( 'tests/hooked-block' );
}
@ -420,7 +411,8 @@ class Tests_Block_Template_Utils extends WP_UnitTestCase {
*/
public function test_inject_ignored_hooked_blocks_metadata_attributes_into_template() {
global $wp_current_filter;
// Mock currently set filter.
// Mock currently set filter. The $wp_current_filter global is reset during teardown by
// WP_UnitTestCase_Base::_restore_hooks() in tests/phpunit/includes/abstract-testcase.php.
$wp_current_filter[] = 'rest_pre_insert_wp_template';
register_block_type(
@ -453,7 +445,8 @@ class Tests_Block_Template_Utils extends WP_UnitTestCase {
*/
public function test_inject_ignored_hooked_blocks_metadata_attributes_into_template_part() {
global $wp_current_filter;
// Mock currently set filter.
// Mock currently set filter. The $wp_current_filter global is reset during teardown by
// WP_UnitTestCase_Base::_restore_hooks() in tests/phpunit/includes/abstract-testcase.php.
$wp_current_filter[] = 'rest_pre_insert_wp_template_part';
register_block_type(