Permalink
Browse files

Merge branch 'hotfix/3797'

Close #3797
  • Loading branch information...
2 parents 06ba23f + e9d63ad commit 0a9a65ca9b7c564140564ec384bd7b529696c748 @weierophinney weierophinney committed Feb 19, 2013
Showing with 2 additions and 162 deletions.
  1. +0 −3 library/Zend/File/Transfer/Adapter/AbstractAdapter.php
  2. +0 −3 library/Zend/File/Transfer/Adapter/FilterPluginManager.php
  3. +0 −3 library/Zend/File/Transfer/Adapter/Http.php
  4. +0 −5 library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
  5. +0 −5 library/Zend/File/Transfer/Exception/BadMethodCallException.php
  6. +0 −3 library/Zend/File/Transfer/Exception/ExceptionInterface.php
  7. +0 −5 library/Zend/File/Transfer/Exception/InvalidArgumentException.php
  8. +0 −5 library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
  9. +0 −5 library/Zend/File/Transfer/Exception/RuntimeException.php
  10. +0 −3 library/Zend/File/Transfer/Transfer.php
  11. +1 −1 library/Zend/Filter/File/RenameUpload.php
  12. +0 −3 library/Zend/Validator/File/Count.php
  13. +0 −3 library/Zend/Validator/File/FilesSize.php
  14. +0 −3 library/Zend/Validator/File/Upload.php
  15. +0 −3 resources/languages/ar/Zend_Captcha.php
  16. +0 −3 resources/languages/ar/Zend_Validate.php
  17. +0 −3 resources/languages/bg/Zend_Captcha.php
  18. +0 −3 resources/languages/bg/Zend_Validate.php
  19. +0 −3 resources/languages/cs/Zend_Captcha.php
  20. +0 −3 resources/languages/cs/Zend_Validate.php
  21. +0 −3 resources/languages/de/Zend_Captcha.php
  22. +0 −3 resources/languages/de/Zend_Validate.php
  23. +0 −3 resources/languages/en/Zend_Captcha.php
  24. +0 −3 resources/languages/en/Zend_Validate.php
  25. +0 −3 resources/languages/es/Zend_Validate.php
  26. +0 −3 resources/languages/fi/Zend_Validate.php
  27. +0 −3 resources/languages/fr/Zend_Captcha.php
  28. +0 −3 resources/languages/fr/Zend_Validate.php
  29. +0 −3 resources/languages/hr/Zend_Validate.php
  30. +0 −3 resources/languages/it/Zend_Captcha.php
  31. +0 −3 resources/languages/it/Zend_Validate.php
  32. +0 −3 resources/languages/ja/Zend_Validate.php
  33. +0 −3 resources/languages/nl/Zend_Validate.php
  34. +0 −3 resources/languages/no/Zend_Captcha.php
  35. +1 −4 resources/languages/no/Zend_Validate.php
  36. +0 −3 resources/languages/pl/Zend_Validate.php
  37. +0 −3 resources/languages/pt_BR/Zend_Captcha.php
  38. +0 −3 resources/languages/pt_BR/Zend_Validate.php
  39. +0 −3 resources/languages/ru/Zend_Validate.php
  40. +0 −3 resources/languages/se/Zend_Captcha.php
  41. +0 −3 resources/languages/se/Zend_Validate.php
  42. +0 −3 resources/languages/sk/Zend_Captcha.php
  43. +0 −3 resources/languages/sk/Zend_Validate.php
  44. +0 −3 resources/languages/sl/Zend_Captcha.php
  45. +0 −3 resources/languages/sl/Zend_Validate.php
  46. +0 −3 resources/languages/sr/Zend_Validate.php
  47. +0 −3 resources/languages/tr/Zend_Captcha.php
  48. +0 −3 resources/languages/tr/Zend_Validate.php
  49. +0 −3 resources/languages/uk/Zend_Validate.php
  50. +0 −3 resources/languages/zh/Zend_Captcha.php
  51. +0 −3 resources/languages/zh/Zend_Validate.php
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Adapter;
@@ -30,8 +29,6 @@
* and filter chains instead.
*
* @todo Rewrite
- * @category Zend
- * @package Zend_File_Transfer
*/
abstract class AbstractAdapter implements TranslatorAwareInterface
{
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File_Transfer
*/
namespace Zend\File\Transfer\Adapter;
@@ -18,8 +17,6 @@
* Enforces that filters retrieved are instances of
* FilterInterface. Additionally, it registers a number of default filters.
*
- * @category Zend
- * @package Zend_File_Transfer
*/
class FilterPluginManager extends BaseManager
{
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Adapter;
@@ -18,8 +17,6 @@
/**
* File transfer adapter class for the HTTP protocol
*
- * @category Zend
- * @package Zend_File_Transfer
*/
class Http extends AbstractAdapter
{
@@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File_Transfer
*/
namespace Zend\File\Transfer\Adapter;
use Zend\Validator\ValidatorPluginManager as BaseManager;
-/**
- * @category Zend
- * @package Zend_File_Transfer
- */
class ValidatorPluginManager extends BaseManager
{
protected $aliases = array(
@@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Exception;
use Zend\File\Exception;
-/**
- * @category Zend
- * @package Zend_File_Transfer
- */
class BadMethodCallException extends Exception\BadMethodCallException implements
ExceptionInterface
{}
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Exception;
@@ -15,8 +14,6 @@
/**
* Exception class for Zend\File\Transfer
*
- * @category Zend
- * @package Zend_File_Transfer
*/
interface ExceptionInterface
extends FileException
@@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Exception;
use Zend\File\Exception;
-/**
- * @category Zend
- * @package Zend_File_Transfer
- */
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
{}
@@ -5,14 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Exception;
-/**
- * @category Zend
- * @package Zend_File_Transfer
- */
class PhpEnvironmentException extends RuntimeException
{}
@@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer\Exception;
use Zend\File\Exception;
-/**
- * @category Zend
- * @package Zend_File_Transfer
- */
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
{}
@@ -5,16 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_File
*/
namespace Zend\File\Transfer;
/**
* Base class for all protocols supporting file transfers
*
- * @category Zend
- * @package Zend_File_Transfer
*/
class Transfer
{
@@ -29,7 +29,7 @@ class RenameUpload extends AbstractFilter
* Store already filtered values, so we can filter multiple
* times the same file without being block by move_uploaded_file
* internal checks
- *
+ *
* @var array
*/
protected $alreadyFiltered = array();
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_Validator
*/
namespace Zend\Validator\File;
@@ -16,8 +15,6 @@
/**
* Validator for counting all given files
*
- * @category Zend
- * @package Zend_Validator
*/
class Count extends AbstractValidator
{
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_Validator
*/
namespace Zend\Validator\File;
@@ -18,8 +17,6 @@
/**
* Validator for the size of all files which will be validated in sum
*
- * @category Zend
- * @package Zend_Validator
*/
class FilesSize extends Size
{
@@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_Validator
*/
namespace Zend\Validator\File;
@@ -16,8 +15,6 @@
/**
* Validator for the maximum size of a file up to a max of 2GB
*
- * @category Zend
- * @package Zend_Validator
*/
class Upload extends AbstractValidator
{
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -10,9 +10,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translator
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @category Zend
- * @package Zend_Translate
- * @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Oops, something went wrong. Retry.

0 comments on commit 0a9a65c

Please sign in to comment.