Changeset 25373

Timestamp:

09/12/2013 03:53:56 AM (11 years ago)

Author:

wonderboymusic

Message:

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

See #25282.

Location:

trunk/tests/phpunit

Files:

• data/images/a2-small-100x75.jpg (modified) (previous)
• tests/actions.php (modified) (4 diffs)

trunk/tests/phpunit/tests/actions.php

@@ -20 +20 @@
         $this->assertEquals(array($tag), $a->get_tags());
 
-        $args = array_pop($a->get_args());
+        $argsvar = $a->get_args();
+        $args = array_pop( $argsvar );
         $this->assertEquals(array(''), $args);
     }
@@ -44 +45 @@
 
     function test_has_action() {
-            $tag = rand_str();
-            $func = rand_str();
-
-            $this->assertFalse( has_action($tag, $func) );
-            $this->assertFalse( has_action($tag) );
-            add_action($tag, $func);
-            $this->assertEquals( 10, has_action($tag, $func) );
-            $this->assertTrue( has_action($tag) );
-            remove_action($tag, $func);
-            $this->assertFalse( has_action($tag, $func) );
-            $this->assertFalse( has_action($tag) );
+        $tag = rand_str();
+        $func = rand_str();
+
+        $this->assertFalse( has_action($tag, $func) );
+        $this->assertFalse( has_action($tag) );
+        add_action($tag, $func);
+        $this->assertEquals( 10, has_action($tag, $func) );
+        $this->assertTrue( has_action($tag) );
+        remove_action($tag, $func);
+        $this->assertFalse( has_action($tag, $func) );
+        $this->assertFalse( has_action($tag) );
     }
 
@@ -83 +84 @@
         do_action($tag, $val);
 
-        $this->assertEquals(1, $a->get_call_count());
-        $this->assertEquals(array($val), array_pop($a->get_args()));
+        $call_count = $a->get_call_count();
+        $this->assertEquals(1, $call_count);
+        $argsvar = $a->get_args();
+        $this->assertEquals( array( $val ), array_pop( $argsvar ) );
     }
 
@@ -100 +103 @@
         do_action($tag, $val1, $val2);
 
+        $call_count = $a1->get_call_count();
         // a1 should be called with both args
-        $this->assertEquals(1, $a1->get_call_count());
-        $this->assertEquals(array($val1, $val2), array_pop($a1->get_args()));
+        $this->assertEquals(1, $call_count);
+        $argsvar1 = $a1->get_args();
+        $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar1 ) );
 
         // a2 should be called with one only
         $this->assertEquals(1, $a2->get_call_count());
-        $this->assertEquals(array($val1), array_pop($a2->get_args()));
+        $argsvar2 = $a2->get_args();
+        $this->assertEquals( array( $val1 ), array_pop( $argsvar2 ) );
     }