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

thomasweidner · thomasweidner · commit e2d24abf6ea9 · 2011-06-26T12:31:18.000+02:00
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

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ public function setUp()`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function testGetSignalShouldReturnSignal()`
	`44`	`+ public function testGetEventShouldReturnEvent()`
`45`	`45`	`{`
`46`	`46`	`$handler = new CallbackHandler('foo', 'rand');`
`47`		`- $this->assertEquals('foo', $handler->getSignal());`
	`47`	`+ $this->assertEquals('foo', $handler->getEvent());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function testCallbackShouldBeStringIfNoHandlerPassedToConstructor()`