Merge branch 'master' of git://github.com/zendframework/zf2

Conflicts: .gitignore
zendframework · Jul 29, 2011 · 5dfc5eb · 5dfc5eb
commit 5dfc5eb
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