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

zendframework · Jun 26, 2011 · e2d24ab · e2d24ab
15 parents 270cb67 + ec1abfc + 290ea90 + 9f4ca1b + edaa760 + c4c0c95 + d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + 636523e + 4cc2cd6 + e34098a + 16367cd
commit e2d24ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -41,7 +41,7 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PriorityQueue implements Countable, IteratorAggregate, Serializable

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/test/PriorityQueueTest.php b/test/PriorityQueueTest.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      Zend_Stdlib
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class PriorityQueueTest extends \PHPUnit_Framework_TestCase