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

Fix the PHP 5.4 `Only variables should be passed by reference` notices in `tests/filters.php`. 

See #25282.



git-svn-id: https://develop.svn.wordpress.org/trunk@25377 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2013-09-12 04:16:59 +00:00
parent 62b7214706
commit 691e3f25a0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/phpunit/tests/filters.php
View File

@ -20,7 +20,8 @@ class Tests_Filters extends WP_UnitTestCase {
// only our hook was called // only our hook was called
$this->assertEquals(array($tag), $a->get_tags()); $this->assertEquals(array($tag), $a->get_tags());
$args = array_pop($a->get_args()); $argsvar = $a->get_args();
$args = array_pop( $argsvar );
$this->assertEquals(array($val), $args); $this->assertEquals(array($val), $args);
} }
@ -87,7 +88,8 @@ class Tests_Filters extends WP_UnitTestCase {
$this->assertEquals($val, apply_filters($tag, $val, $arg1)); $this->assertEquals($val, apply_filters($tag, $val, $arg1));
$this->assertEquals(1, $a->get_call_count()); $this->assertEquals(1, $a->get_call_count());
$this->assertEquals(array($val, $arg1), array_pop($a->get_args())); $argsvar = $a->get_args();
$this->assertEquals( array( $val, $arg1 ), array_pop( $argsvar ) );
} }
function test_filter_args_2() { function test_filter_args_2() {
@ -106,11 +108,13 @@ class Tests_Filters extends WP_UnitTestCase {
// a1 should be called with both args // a1 should be called with both args
$this->assertEquals(1, $a1->get_call_count()); $this->assertEquals(1, $a1->get_call_count());
$this->assertEquals(array($val, $arg1, $arg2), array_pop($a1->get_args())); $argsvar1 = $a1->get_args();
$this->assertEquals( array( $val, $arg1, $arg2 ), array_pop( $argsvar1 ) );
// a2 should be called with one only // a2 should be called with one only
$this->assertEquals(1, $a2->get_call_count()); $this->assertEquals(1, $a2->get_call_count());
$this->assertEquals(array($val), array_pop($a2->get_args())); $argsvar2 = $a2->get_args();
$this->assertEquals( array( $val ), array_pop( $argsvar2 ) );
} }
function test_filter_priority() { function test_filter_priority() {
@ -246,9 +250,9 @@ class Tests_Filters extends WP_UnitTestCase {
return $tag; return $tag;
} }
/** /**
* @ticket 21169 * @ticket 21169
*/ */
function test_filter_removal_during_filter() { function test_filter_removal_during_filter() {
$tag = rand_str(); $tag = rand_str();
$a = new MockAction(); $a = new MockAction();