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

Commit b241e8d

Browse files
ezimuelezimuel
committed
Merged from zf2/master
44 parents d06b3a5 + 371eaa8 + c9fbe3f + 77552c9 + 5883d28 + 518460f + 63a6a3b + f21d820 + 5b80282 + 8d4f7c0 + 3428c24 + 50a5cf9 + 0fcf91c + ffd0e6c + 90cc750 + 4c0cba4 + 9e64972 + 3a86f54 + f4931d8 + 9c496b9 + f36d38f + 1b580df + dab01ce + bc6e247 + 96739b6 + e1b5376 + 1c7183f + 0e68ed1 + 5b3198f + 929c939 + f7e2963 + 611c83e + 1d9e7ae + eae64aa + 1f3f9e7 + b2d7401 + 2f1d9d3 + de6b908 + c73007c + 9565c63 + 10c9e19 + 33f9f3b + 4585cfe + bc2a6d0 commit b241e8d

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

‎src/Exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_File
1717
* @subpackage Exception
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

‎src/Exception/InvalidArgumentException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_File
1717
* @subpackage Exception
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

‎src/Transfer/Adapter/AbstractAdapter.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_File_Transfer
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -43,7 +43,7 @@
4343
* @todo Rewrite
4444
* @category Zend
4545
* @package Zend_File_Transfer
46-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
46+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
4747
* @license http://framework.zend.com/license/new-bsd New BSD License
4848
*/
4949
abstract class AbstractAdapter

‎src/Transfer/Adapter/Http.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_File_Transfer
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
*/
2020

@@ -35,7 +35,7 @@
3535
* @uses \Zend\ProgressBar\ProgressBar
3636
* @category Zend
3737
* @package Zend_File_Transfer
38-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
38+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3939
* @license http://framework.zend.com/license/new-bsd New BSD License
4040
*/
4141
class Http extends AbstractAdapter

‎src/Transfer/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_File_Transfer
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 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_File_Transfer
31-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
31+
* @copyright Copyright (c) 2005-2012 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/Transfer/Exception/PhpEnvironmentException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
namespace Zend\File\Transfer\Exception;
44

55
class PhpEnvironmentException
6-
extends \PhpEnvironmentException
6+
extends \RuntimeException
77
implements \Zend\File\Transfer\Exception
88
{}

‎src/Transfer/Transfer.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_File_Transfer
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 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
* @uses \Zend\Loader
3131
* @category Zend
3232
* @package Zend_File_Transfer
33-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class Transfer

‎test/ClassFileLocatorTest.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_File
1717
* @subpackage UnitTests
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

@@ -30,7 +30,7 @@
3030
* @category Zend
3131
* @package Zend_File
3232
* @subpackage UnitTests
33-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
* @group Zend_File
3636
*/

‎test/TestAsset/LocatorShouldFindThis.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_Loader
1717
* @subpackage Exception
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

@@ -24,7 +24,7 @@
2424
/**
2525
* @package Zend_Loader
2626
* @subpackage Exception
27-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
27+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
2828
* @license http://framework.zend.com/license/new-bsd New BSD License
2929
*/
3030
interface LocatorShouldFindThis

‎test/Transfer/Adapter/AbstractTest.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_File
1717
* @subpackage UnitTests
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

@@ -36,7 +36,7 @@
3636
* @category Zend
3737
* @package Zend_File
3838
* @subpackage UnitTests
39-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
39+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
4040
* @license http://framework.zend.com/license/new-bsd New BSD License
4141
* @group Zend_File
4242
*/

0 commit comments

Comments
 (0)