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

Commit 10f278f

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
6 parents 023de10 + 85fcc7b + 5d8866f + 634bb62 + 453bb28 + 252fdc8 commit 10f278f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+80
-80
lines changed

‎src/Client.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @category Zend
1717
* @package Zend_Http
1818
* @subpackage Client
19-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
2020
* @license http://framework.zend.com/license/new-bsd New BSD License
2121
*/
2222

@@ -48,7 +48,7 @@
4848
* @package Zend_Http
4949
* @subpackage Client
5050
* @throws \Zend\Http\Client\Exception
51-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
51+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
5252
* @license http://framework.zend.com/license/new-bsd New BSD License
5353
*/
5454
class Client

‎src/Client/Adapter.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_Http
1717
* @subpackage Client_Adapter
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
*/
2121

@@ -33,7 +33,7 @@
3333
* @category Zend
3434
* @package Zend_Http
3535
* @subpackage Client_Adapter
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
interface Adapter

‎src/Client/Adapter/Curl.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @category Zend
1717
* @package Zend_Http
1818
* @subpackage Client_Adapter
19-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
2020
* @license http://framework.zend.com/license/new-bsd New BSD License
2121
*/
2222

@@ -41,7 +41,7 @@
4141
* @category Zend
4242
* @package Zend_Http
4343
* @subpackage Client_Adapter
44-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
44+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
4545
* @license http://framework.zend.com/license/new-bsd New BSD License
4646
*/
4747
class Curl implements HttpAdapter, Stream

‎src/Client/Adapter/Exception.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_Http
1717
* @subpackage Client_Adapter_Exception
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
*/
2121

@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Http
3131
* @subpackage Client_Adapter
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
interface Exception extends \Zend\Http\Client\Exception

‎src/Client/Adapter/Exception/InitializationException.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_Http
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
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
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 InitializationException

‎src/Client/Adapter/Exception/InvalidArgumentException.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_Http
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
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
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 InvalidArgumentException

‎src/Client/Adapter/Exception/OutOfRangeException.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_Http
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
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
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 OutOfRangeException

‎src/Client/Adapter/Exception/RuntimeException.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_Http
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
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
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 RuntimeException

‎src/Client/Adapter/Exception/TimeoutException.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_Http
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
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
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 TimeoutException

‎src/Client/Adapter/Proxy.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_Http
1717
* @subpackage Client_Adapter
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
*/
2121

@@ -43,7 +43,7 @@
4343
* @category Zend
4444
* @package Zend_Http
4545
* @subpackage Client_Adapter
46-
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
46+
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
4747
* @license http://framework.zend.com/license/new-bsd New BSD License
4848
*/
4949
class Proxy extends Socket

0 commit comments

Comments
 (0)