sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Docs: Remove references to the now-defunct $merged_filters global from two method DocBlocks in WP_UnitTestCase.

Browse Source 
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
This commit is contained in:
Drew Jaynes 2018-12-19 07:12:46 +00:00
parent a261700dab
commit 5e3c64657a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/phpunit/includes/testcase.php
View File

@ -273,10 +273,9 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
/** /**
* Saves the action and filter-related globals so they can be restored later. * 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(). * 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_actions
* @global array $wp_current_filter * @global array $wp_current_filter
* @global array $wp_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() * Restores the hook-related globals to their state at setUp()
* so that future tests aren't affected by hooks set during this last test. * 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_actions
* @global array $wp_current_filter * @global array $wp_current_filter
* @global array $wp_filter * @global array $wp_filter