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

Commit 4bef446

Browse files
author
Grzegorz Drozd
committed
Merge branch 'master' of git://github.com/zendframework/zf2
Fixed files permissions
129 parents 50a9cf8 + 476d115 + c660c64 + 23e480a + 2d1a86f + bcd3a85 + d46ca8d + 236d691 + 0c0ae53 + 16da5d7 + 1c4489e + a57bb3d + c14d67b + b241e8d + 10c9e19 + 33f9f3b + 4585cfe + 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 + bc2a6d0 + 264d24f + c9c493c + 3992e0d + 5225965 + 0de9a5c + 867db21 + 34fe2aa + 6ec2723 + e576e38 + cbc0283 + d007f6e + a8d7175 + 2df1fa2 + 2eea980 + 5e212bf + 099a852 + b4fea29 + ca1f464 + 23d6321 + 296e43e + d444a38 + 3db95a1 + 981d623 + 0a2e3ae + af23c99 + 80f5165 + 78d16a9 + 6bc4f23 + ece1d99 + 0b9ced2 + 9d50bff + db4f03e + f8f7897 + 4cb349f + f5287db + e7abf4a + b1e5a28 + 6c77a16 + d3f730c + 9abb387 + c0b8c0d + f8bc057 + 4f32b4b + aa46231 + 52390dd + aed5127 + d6219ab + cc8aa50 + 3796880 + 3460327 + 6371934 + bdc1874 + 540ba2f + c5fa53c + c1cd9d0 + e861d7a + bfa4749 + 5ec28c8 + 5078786 + 9d152ef + 3376d96 + 2851abb + 8728f2a + e5443b4 + 6b3466e + 435b7e1 + 3abf077 + 3e7551c + 0af2391 + 60c43e9 + d3bdecf commit 4bef446

17 files changed

+3
-69
lines changed

‎composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@
2727
"suggest": {
2828
"zendframework/zend-filter": "Zend\\Filter component",
2929
"zendframework/zend-i18n": "Zend\\I18n component",
30-
"zendframework/zend-validator": "Zend\\Validator component",
31-
"zendframework/zend-loader": "Zend\\Loader component"
30+
"zendframework/zend-validator": "Zend\\Validator component"
3231
},
3332
"extra": {
3433
"branch-alias": {
35-
"dev-master": "2.4-dev",
36-
"dev-develop": "2.5-dev"
34+
"dev-master": "2.1-dev",
35+
"dev-develop": "2.2-dev"
3736
}
3837
},
3938
"autoload-dev": {

‎src/ClassFileLocator.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File;
@@ -19,9 +18,6 @@
1918

2019
/**
2120
* Locate files containing PHP classes, interfaces, abstracts or traits
22-
*
23-
* @category Zend
24-
* @package Zend_File
2521
*/
2622
class ClassFileLocator extends FilterIterator
2723
{

‎src/Exception/BadMethodCallException.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File\Exception;
1211

13-
/**
14-
* @category Zend
15-
* @package Zend_File_Transfer
16-
*/
1712
class BadMethodCallException extends \BadMethodCallException implements
1813
ExceptionInterface
1914
{}

‎src/Exception/ExceptionInterface.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File\Exception;
1211

1312
/**
1413
* Marker interface for exceptions found in this component
15-
*
16-
* @package Zend_File
17-
* @subpackage Exception
1814
*/
1915
interface ExceptionInterface
2016
{

‎src/Exception/InvalidArgumentException.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File\Exception;
1211

1312
/**
1413
* Exception class raised when invalid arguments are discovered
15-
*
16-
* @package Zend_File
1714
*/
1815
class InvalidArgumentException
1916
extends \InvalidArgumentException

‎src/Exception/RuntimeException.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File\Exception;
1211

13-
/**
14-
* @category Zend
15-
* @package Zend_File_Transfer
16-
*/
1712
class RuntimeException
1813
extends \RuntimeException
1914
implements ExceptionInterface

‎src/PhpClassFile.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File;
@@ -14,9 +13,6 @@
1413

1514
/**
1615
* Locate files containing PHP classes, interfaces, abstracts or traits
17-
*
18-
* @category Zend
19-
* @package Zend_File
2016
*/
2117
class PhpClassFile extends SplFileInfo
2218
{

‎src/Transfer/Adapter/AbstractAdapter.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File\Transfer\Adapter;
@@ -30,8 +29,6 @@
3029
* and filter chains instead.
3130
*
3231
* @todo Rewrite
33-
* @category Zend
34-
* @package Zend_File_Transfer
3532
*/
3633
abstract class AbstractAdapter implements TranslatorAwareInterface
3734
{

‎src/Transfer/Adapter/FilterPluginManager.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File_Transfer
98
*/
109

1110
namespace Zend\File\Transfer\Adapter;
@@ -18,8 +17,6 @@
1817
* Enforces that filters retrieved are instances of
1918
* FilterInterface. Additionally, it registers a number of default filters.
2019
*
21-
* @category Zend
22-
* @package Zend_File_Transfer
2320
*/
2421
class FilterPluginManager extends BaseManager
2522
{

‎src/Transfer/Adapter/Http.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_File
98
*/
109

1110
namespace Zend\File\Transfer\Adapter;
@@ -18,8 +17,6 @@
1817
/**
1918
* File transfer adapter class for the HTTP protocol
2019
*
21-
* @category Zend
22-
* @package Zend_File_Transfer
2320
*/
2421
class Http extends AbstractAdapter
2522
{

0 commit comments

Comments
 (0)