From 5e3c64657ac04ba6de6c9fd6908efa8affa3b484 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Wed, 19 Dec 2018 07:12:46 +0000 Subject: [PATCH] Docs: Remove references to the now-defunct `$merged_filters` global from two method DocBlocks in `WP_UnitTestCase`. The `$merged_filters` global was removed in [38571]. Props frank-klein. Fixes #44496. git-svn-id: https://develop.svn.wordpress.org/trunk@44327 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/includes/testcase.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/phpunit/includes/testcase.php b/tests/phpunit/includes/testcase.php index db3f0b9fb6..619264e3f4 100644 --- a/tests/phpunit/includes/testcase.php +++ b/tests/phpunit/includes/testcase.php @@ -273,10 +273,9 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase { /** * Saves the action and filter-related globals so they can be restored later. * - * Stores $merged_filters, $wp_actions, $wp_current_filter, and $wp_filter + * Stores $wp_actions, $wp_current_filter, and $wp_filter * on a class variable so they can be restored on tearDown() using _restore_hooks(). * - * @global array $merged_filters * @global array $wp_actions * @global array $wp_current_filter * @global array $wp_filter @@ -297,7 +296,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase { * Restores the hook-related globals to their state at setUp() * so that future tests aren't affected by hooks set during this last test. * - * @global array $merged_filters * @global array $wp_actions * @global array $wp_current_filter * @global array $wp_filter