Changeset 57799

Timestamp:

03/11/2024 12:52:18 PM (7 weeks ago)

Author:

Bernhard Reiter

Message:

Block Hooks: Remove filter global reset from test teardown.

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].
Props swissspidy, timothyblynjacobs.
See #60671.

File:

• trunk/tests/phpunit/tests/block-template-utils.php (modified) (3 diffs)

trunk/tests/phpunit/tests/block-template-utils.php

@@ -93 +93 @@
      */
     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' );
@@ -421 +412 @@
     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';
 
@@ -454 +446 @@
     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';