Merge branch 'master' of git://git.zendframework.com/zf into ZF2-13

zendframework · Jul 22, 2011 · 0b47726 · 0b47726
18 parents 290ea90 + 9f4ca1b + edaa760 + c4c0c95 + d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + 636523e + 4cc2cd6 + e34098a + e7d6206 + e2d24ab + ec1abfc + 16367cd + 943c77f + 8226e5b
commit 0b47726
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/test/CallbackHandlerTest.php b/test/CallbackHandlerTest.php
@@ -41,10 +41,10 @@ public function setUp()
         }
     }
 
-    public function testGetSignalShouldReturnSignal()
+    public function testGetEventShouldReturnEvent()
     {
         $handler = new CallbackHandler('foo', 'rand');
-        $this->assertEquals('foo', $handler->getSignal());
+        $this->assertEquals('foo', $handler->getEvent());
     }
 
     public function testCallbackShouldBeStringIfNoHandlerPassedToConstructor()

diff --git a/tools/phptools b/tools/phptools