Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit d21f055

Browse files
weierophinneyweierophinney
committed
Merge branch 'ZF-10889' of https://github.com/thomasweidner/zf2 into feature/zf-10889
Conflicts: library/Zend/EventManager/HandlerAggregate.php library/Zend/EventManager/ResponseCollection.php library/Zend/SignalSlot/GlobalSignals.php library/Zend/SignalSlot/Signals.php library/Zend/Stdlib/FilterChain.php tests/Zend/EventManager/TestAsset/MockAggregate.php tests/Zend/EventManager/TestAsset/StaticEventsMock.php tests/Zend/SignalSlot/GlobalSignalsTest.php tests/Zend/SignalSlot/SignalsTest.php tests/Zend/Stdlib/FilterChainTest.php
7 parents 010fb36 + 64c7b8d + edaa760 + c4c0c95 + 636523e + 4cc2cd6 + 5b18029 commit d21f055

11 files changed

+22
-22
lines changed

‎src/ArrayStack.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -31,7 +31,7 @@
3131
*
3232
* @category Zend
3333
* @package Zend_Stdlib
34-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
34+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3535
* @license http://framework.zend.com/license/new-bsd New BSD License
3636
*/
3737
class ArrayStack extends ArrayObject

‎src/CallbackHandler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -32,7 +32,7 @@
3232
*
3333
* @category Zend
3434
* @package Zend_Stdlib
35-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
35+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3636
* @license http://framework.zend.com/license/new-bsd New BSD License
3737
*/
3838
class CallbackHandler

‎src/Exception.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -28,7 +28,7 @@
2828
*
2929
* @category Zend
3030
* @package Zend_Stdlib
31-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
31+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3232
* @license http://framework.zend.com/license/new-bsd New BSD License
3333
*/
3434
interface Exception

‎src/Exception/InvalidCallbackException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -33,7 +33,7 @@
3333
* @uses Zend\Stdlib\Exception
3434
* @category Zend
3535
* @package Zend_Stdlib
36-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
36+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3737
* @license http://framework.zend.com/license/new-bsd New BSD License
3838
*/
3939
class InvalidCallbackException

‎src/SplPriorityQueue.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -33,7 +33,7 @@
3333
*
3434
* @category Zend
3535
* @package Zend_Stdlib
36-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
36+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3737
* @license http://framework.zend.com/license/new-bsd New BSD License
3838
*/
3939
class SplPriorityQueue extends \SplPriorityQueue implements Serializable

‎src/SplQueue.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -30,7 +30,7 @@
3030
*
3131
* @category Zend
3232
* @package Zend_Stdlib
33-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class SplQueue extends \SplQueue implements Serializable

‎src/SplStack.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Stdlib
17-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -30,7 +30,7 @@
3030
*
3131
* @category Zend
3232
* @package Zend_Stdlib
33-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class SplStack extends \SplStack implements Serializable

‎test/CallbackHandlerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Stdlib
1717
* @subpackage UnitTests
18-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id:$
2121
*/
@@ -29,7 +29,7 @@
2929
* @package Zend_Stdlib
3030
* @subpackage UnitTests
3131
* @group Zend_Stdlib
32-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class CallbackHandlerTest extends \PHPUnit_Framework_TestCase

‎test/SplPriorityQueueTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Stdlib
1717
* @subpackage UnitTests
18-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id:$
2121
*/
@@ -29,7 +29,7 @@
2929
* @package Zend_Stdlib
3030
* @subpackage UnitTests
3131
* @group Zend_Stdlib
32-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class SplPriorityQueueTest extends \PHPUnit_Framework_TestCase

‎test/SplQueueTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Stdlib
1717
* @subpackage UnitTests
18-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id:$
2121
*/
@@ -29,7 +29,7 @@
2929
* @package Zend_Stdlib
3030
* @subpackage UnitTests
3131
* @group Zend_Stdlib
32-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class SplQueueTest extends \PHPUnit_Framework_TestCase

0 commit comments

Comments
 (0)