Merge branch 'rem.catpacksubdocblock' of git://github.com/samsonasik/…

…zf2 into hotfix/3797
zendframework · Feb 19, 2013 · e9d63ad · e9d63ad
2 parents 06ba23f + 36af7fb
commit e9d63ad
Show file tree

Hide file tree

Showing 51 changed files with 2 additions and 162 deletions.
diff --git a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/library/Zend/File/Transfer/Adapter/AbstractAdapter.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
 {

diff --git a/library/Zend/File/Transfer/Adapter/FilterPluginManager.php b/library/Zend/File/Transfer/Adapter/FilterPluginManager.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_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
 {

diff --git a/library/Zend/File/Transfer/Adapter/Http.php b/library/Zend/File/Transfer/Adapter/Http.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;
@@ -18,8 +17,6 @@
 /**
  * File transfer adapter class for the HTTP protocol
  *
- * @category  Zend
- * @package   Zend_File_Transfer
  */
 class Http extends AbstractAdapter
 {

diff --git a/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php b/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
@@ -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(

diff --git a/library/Zend/File/Transfer/Exception/BadMethodCallException.php b/library/Zend/File/Transfer/Exception/BadMethodCallException.php
@@ -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
 {}
diff --git a/library/Zend/File/Transfer/Exception/ExceptionInterface.php b/library/Zend/File/Transfer/Exception/ExceptionInterface.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\Exception;
@@ -15,8 +14,6 @@
 /**
  * Exception class for Zend\File\Transfer
  *
- * @category   Zend
- * @package    Zend_File_Transfer
  */
 interface ExceptionInterface
     extends FileException

diff --git a/library/Zend/File/Transfer/Exception/InvalidArgumentException.php b/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
@@ -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
 {}
diff --git a/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php b/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
@@ -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
 {}
diff --git a/library/Zend/File/Transfer/Exception/RuntimeException.php b/library/Zend/File/Transfer/Exception/RuntimeException.php
@@ -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
 {}
diff --git a/library/Zend/File/Transfer/Transfer.php b/library/Zend/File/Transfer/Transfer.php
@@ -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
 {

diff --git a/library/Zend/Filter/File/RenameUpload.php b/library/Zend/Filter/File/RenameUpload.php
@@ -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();

diff --git a/library/Zend/Validator/File/Count.php b/library/Zend/Validator/File/Count.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_Validator
  */
 
 namespace Zend\Validator\File;
@@ -16,8 +15,6 @@
 /**
  * Validator for counting all given files
  *
- * @category  Zend
- * @package   Zend_Validator
  */
 class Count extends AbstractValidator
 {

diff --git a/library/Zend/Validator/File/FilesSize.php b/library/Zend/Validator/File/FilesSize.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_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
 {

diff --git a/library/Zend/Validator/File/Upload.php b/library/Zend/Validator/File/Upload.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_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
 {

diff --git a/resources/languages/ar/Zend_Captcha.php b/resources/languages/ar/Zend_Captcha.php
@@ -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
  */

diff --git a/resources/languages/ar/Zend_Validate.php b/resources/languages/ar/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/bg/Zend_Captcha.php b/resources/languages/bg/Zend_Captcha.php
@@ -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
  */

diff --git a/resources/languages/bg/Zend_Validate.php b/resources/languages/bg/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/cs/Zend_Captcha.php b/resources/languages/cs/Zend_Captcha.php
@@ -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
  */

diff --git a/resources/languages/cs/Zend_Validate.php b/resources/languages/cs/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/de/Zend_Captcha.php b/resources/languages/de/Zend_Captcha.php
@@ -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
  */

diff --git a/resources/languages/de/Zend_Validate.php b/resources/languages/de/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/en/Zend_Captcha.php b/resources/languages/en/Zend_Captcha.php
@@ -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
  */

diff --git a/resources/languages/en/Zend_Validate.php b/resources/languages/en/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/es/Zend_Validate.php b/resources/languages/es/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/fi/Zend_Validate.php b/resources/languages/fi/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/fr/Zend_Captcha.php b/resources/languages/fr/Zend_Captcha.php
@@ -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
  */

diff --git a/resources/languages/fr/Zend_Validate.php b/resources/languages/fr/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/hr/Zend_Validate.php b/resources/languages/hr/Zend_Validate.php
@@ -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
  */

diff --git a/resources/languages/it/Zend_Captcha.php b/resources/languages/it/Zend_Captcha.php
@@ -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
  */