Просмотр исходного кода

Fixes DocBlocks in Zend_Validate

Frank Brückner 11 лет назад
Родитель
Сommit
0b689b7f55
45 измененных файлов с 68 добавлено и 83 удалено
  1. 2 1
      library/Zend/Validate/Abstract.php
  2. 1 2
      library/Zend/Validate/Alnum.php
  3. 1 2
      library/Zend/Validate/Alpha.php
  4. 1 2
      library/Zend/Validate/Barcode.php
  5. 0 2
      library/Zend/Validate/Barcode/Code25.php
  6. 0 2
      library/Zend/Validate/Barcode/Code25interleaved.php
  7. 0 2
      library/Zend/Validate/Barcode/Code39.php
  8. 0 2
      library/Zend/Validate/Barcode/Code39ext.php
  9. 0 2
      library/Zend/Validate/Barcode/Code93.php
  10. 0 2
      library/Zend/Validate/Barcode/Code93ext.php
  11. 0 2
      library/Zend/Validate/Barcode/Ean2.php
  12. 0 2
      library/Zend/Validate/Barcode/Ean5.php
  13. 0 2
      library/Zend/Validate/Barcode/Intelligentmail.php
  14. 1 1
      library/Zend/Validate/Between.php
  15. 4 5
      library/Zend/Validate/Callback.php
  16. 4 2
      library/Zend/Validate/CreditCard.php
  17. 1 2
      library/Zend/Validate/Date.php
  18. 4 0
      library/Zend/Validate/Db/Abstract.php
  19. 3 3
      library/Zend/Validate/EmailAddress.php
  20. 2 1
      library/Zend/Validate/File/Count.php
  21. 2 1
      library/Zend/Validate/File/Crc32.php
  22. 2 1
      library/Zend/Validate/File/Exists.php
  23. 1 2
      library/Zend/Validate/File/Extension.php
  24. 1 1
      library/Zend/Validate/File/FilesSize.php
  25. 2 1
      library/Zend/Validate/File/Hash.php
  26. 1 1
      library/Zend/Validate/File/ImageSize.php
  27. 1 2
      library/Zend/Validate/File/IsCompressed.php
  28. 1 2
      library/Zend/Validate/File/IsImage.php
  29. 2 3
      library/Zend/Validate/File/Md5.php
  30. 7 8
      library/Zend/Validate/File/MimeType.php
  31. 2 1
      library/Zend/Validate/File/Sha1.php
  32. 1 0
      library/Zend/Validate/File/Size.php
  33. 3 3
      library/Zend/Validate/File/Upload.php
  34. 1 0
      library/Zend/Validate/Float.php
  35. 1 1
      library/Zend/Validate/GreaterThan.php
  36. 3 5
      library/Zend/Validate/Hostname.php
  37. 3 2
      library/Zend/Validate/Iban.php
  38. 2 2
      library/Zend/Validate/Identical.php
  39. 2 2
      library/Zend/Validate/InArray.php
  40. 1 0
      library/Zend/Validate/Int.php
  41. 2 1
      library/Zend/Validate/Ip.php
  42. 0 1
      library/Zend/Validate/Isbn.php
  43. 1 1
      library/Zend/Validate/LessThan.php
  44. 0 1
      library/Zend/Validate/Regex.php
  45. 2 2
      library/Zend/Validate/StringLength.php

+ 2 - 1
library/Zend/Validate/Abstract.php

@@ -345,6 +345,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
      * Set translation object
      *
      * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Abstract
      */
     public function setTranslator($translator = null)
@@ -392,7 +393,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
      * Set default translation object for all validate objects
      *
      * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public static function setDefaultTranslator($translator = null)
     {

+ 1 - 2
library/Zend/Validate/Alnum.php

@@ -65,8 +65,7 @@ class Zend_Validate_Alnum extends Zend_Validate_Abstract
     /**
      * Sets default option values for this instance
      *
-     * @param  boolean|Zend_Config $allowWhiteSpace
-     * @return void
+     * @param boolean|Zend_Config $allowWhiteSpace
      */
     public function __construct($allowWhiteSpace = false)
     {

+ 1 - 2
library/Zend/Validate/Alpha.php

@@ -65,8 +65,7 @@ class Zend_Validate_Alpha extends Zend_Validate_Abstract
     /**
      * Sets default option values for this instance
      *
-     * @param  boolean|Zend_Config $allowWhiteSpace
-     * @return void
+     * @param boolean|Zend_Config $allowWhiteSpace
      */
     public function __construct($allowWhiteSpace = false)
     {

+ 1 - 2
library/Zend/Validate/Barcode.php

@@ -77,7 +77,6 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
      *
      * @param  string|Zend_Config|
      *         Zend_Validate_Barcode_BarcodeAdapter $adapter Barcode adapter to use
-     * @return void
      * @throws Zend_Validate_Exception
      */
     public function __construct($adapter)
@@ -126,7 +125,7 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
      *
      * @param  string|Zend_Validate_Barcode $adapter Barcode adapter to use
      * @param  array  $options Options for this adapter
-     * @return void
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function setAdapter($adapter, $options = null)

+ 0 - 2
library/Zend/Validate/Barcode/Code25.php

@@ -54,8 +54,6 @@ class Zend_Validate_Barcode_Code25 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Code25interleaved.php

@@ -54,8 +54,6 @@ class Zend_Validate_Barcode_Code25interleaved extends Zend_Validate_Barcode_Adap
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Code39.php

@@ -67,8 +67,6 @@ class Zend_Validate_Barcode_Code39 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Code39ext.php

@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Code39ext extends Zend_Validate_Barcode_AdapterAbstr
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Code93.php

@@ -68,8 +68,6 @@ class Zend_Validate_Barcode_Code93 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Code93ext.php

@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Code93ext extends Zend_Validate_Barcode_AdapterAbstr
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Ean2.php

@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Ean2 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Ean5.php

@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Ean5 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 0 - 2
library/Zend/Validate/Barcode/Intelligentmail.php

@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_Adapte
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {

+ 1 - 1
library/Zend/Validate/Between.php

@@ -94,7 +94,7 @@ class Zend_Validate_Between extends Zend_Validate_Abstract
      *   'inclusive' => boolean, inclusive border values
      *
      * @param  array|Zend_Config $options
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {

+ 4 - 5
library/Zend/Validate/Callback.php

@@ -69,10 +69,8 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|array $callback
-     * @param  mixed   $max
-     * @param  boolean $inclusive
-     * @return void
+     * @param  mixed $callback
+     * @throws Zend_Validate_Exception
      */
     public function __construct($callback = null)
     {
@@ -107,6 +105,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
      * Sets the callback
      *
      * @param  string|array $callback
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Callback Provides a fluent interface
      */
     public function setCallback($callback)
@@ -132,7 +131,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
     /**
      * Sets options for the callback
      *
-     * @param  mixed $max
+     * @param  mixed $options
      * @return Zend_Validate_Callback Provides a fluent interface
      */
     public function setOptions($options)

+ 4 - 2
library/Zend/Validate/CreditCard.php

@@ -136,7 +136,7 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
     /**
      * Constructor
      *
-     * @param string|array $type OPTIONAL Type of CCI to allow
+     * @param string|array|Zend_Config $options OPTIONAL Type of CCI to allow
      */
     public function __construct($options = array())
     {
@@ -222,7 +222,9 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
     /**
      * Sets a new callback for service validation
      *
-     * @param unknown_type $service
+     * @param mixed $service
+     * @throws Zend_Validate_Exception
+     * @return $this
      */
     public function setService($service)
     {

+ 1 - 2
library/Zend/Validate/Date.php

@@ -71,8 +71,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|Zend_Config $options OPTIONAL
-     * @return void
+     * @param string|array|Zend_Config $options OPTIONAL
      */
     public function __construct($options = array())
     {

+ 4 - 0
library/Zend/Validate/Db/Abstract.php

@@ -97,6 +97,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      * 'adapter' => An optional database adapter to use
      *
      * @param array|Zend_Config $options Options to use for this validator
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
@@ -152,6 +153,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
     /**
      * Returns the set adapter
      *
+     * @throws Zend_Validate_Exception
      * @return Zend_Db_Adapter
      */
     public function getAdapter()
@@ -173,6 +175,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      * Sets a new database adapter
      *
      * @param  Zend_Db_Adapter_Abstract $adapter
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Db_Abstract
      */
     public function setAdapter($adapter)
@@ -278,6 +281,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      * Sets the select object to be used by the validator
      *
      * @param Zend_Db_Select $select
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Db_Abstract
      */
     public function setSelect($select)

+ 3 - 3
library/Zend/Validate/EmailAddress.php

@@ -132,8 +132,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * 'mx'       => If MX check should be enabled, boolean
      * 'deep'     => If a deep MX check should be done, boolean
      *
-     * @param array|Zend_Config $options OPTIONAL
-     * @return void
+     * @param array|string|Zend_Config $options OPTIONAL
      */
     public function __construct($options = array())
     {
@@ -242,7 +241,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
     /**
      * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
      * @param int                    $allow             OPTIONAL
-     * @return void
+     * @return $this
      */
     public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
     {
@@ -283,6 +282,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * This only applies when DNS hostnames are validated
      *
      * @param boolean $mx Set allowed to true to validate for MX records, and false to not validate them
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_EmailAddress Provides a fluent inteface
      */
     public function setValidateMx($mx)

+ 2 - 1
library/Zend/Validate/File/Count.php

@@ -101,7 +101,7 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract
      * 'max': Maximum filecount
      *
      * @param  integer|array|Zend_Config $options Options for the adapter
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
@@ -210,6 +210,7 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract
      * Adds a file for validation
      *
      * @param string|array $file
+     * @return $this
      */
     public function addFile($file)
     {

+ 2 - 1
library/Zend/Validate/File/Crc32.php

@@ -61,7 +61,8 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
      * Sets validator options
      *
      * @param  string|array|Zend_Config $options
-     * @return void
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_File_Crc32
      */
     public function __construct($options)
     {

+ 2 - 1
library/Zend/Validate/File/Exists.php

@@ -63,7 +63,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  string|array|Zend_Config $directory
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($directory = array())
     {
@@ -113,6 +113,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract
      * Adds the file directory which will be checked
      *
      * @param  string|array $directory The directory to add for validation
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_File_Extension Provides a fluent interface
      */
     public function addDirectory($directory)

+ 1 - 2
library/Zend/Validate/File/Extension.php

@@ -71,8 +71,7 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|array|Zend_Config $options
-     * @return void
+     * @param string|array|Zend_Config $options
      */
     public function __construct($options)
     {

+ 1 - 1
library/Zend/Validate/File/FilesSize.php

@@ -64,7 +64,7 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size
      * It also accepts an array with the keys 'min' and 'max'
      *
      * @param  integer|array|Zend_Config $options Options for this validator
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {

+ 2 - 1
library/Zend/Validate/File/Hash.php

@@ -61,7 +61,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  string|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
@@ -109,6 +109,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract
      * Adds the hash for one or multiple files
      *
      * @param  string|array $options
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_File_Hash Provides a fluent interface
      */
     public function addHash($options)

+ 1 - 1
library/Zend/Validate/File/ImageSize.php

@@ -120,7 +120,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract
      * - maxwidth
      *
      * @param  Zend_Config|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {

+ 1 - 2
library/Zend/Validate/File/IsCompressed.php

@@ -53,8 +53,7 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
     /**
      * Sets validator options
      *
-     * @param  string|array|Zend_Config $compression
-     * @return void
+     * @param string|array|Zend_Config $mimetype
      */
     public function __construct($mimetype = array())
     {

+ 1 - 2
library/Zend/Validate/File/IsImage.php

@@ -53,8 +53,7 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
     /**
      * Sets validator options
      *
-     * @param  string|array|Zend_Config $mimetype
-     * @return void
+     * @param string|array|Zend_Config $mimetype
      */
     public function __construct($mimetype = array())
     {

+ 2 - 3
library/Zend/Validate/File/Md5.php

@@ -63,7 +63,8 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
      * $hash is the hash we accept for the file $file
      *
      * @param  string|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_File_Md5
      */
     public function __construct($options)
     {
@@ -93,7 +94,6 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
      * Sets the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @param  string       $algorithm (Deprecated) Algorithm to use, fixed to md5
      * @return Zend_Validate_File_Hash Provides a fluent interface
      */
     public function setHash($options)
@@ -123,7 +123,6 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
      * Adds the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @param  string       $algorithm (Deprecated) Algorithm to use, fixed to md5
      * @return Zend_Validate_File_Hash Provides a fluent interface
      */
     public function addHash($options)

+ 7 - 8
library/Zend/Validate/File/MimeType.php

@@ -127,7 +127,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      * Mimetype to accept
      *
      * @param  string|array $mimetype MimeType
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($mimetype)
     {
@@ -275,7 +275,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      * Defines if the http header should be used
      * Note that this is unsave and therefor the default value is false
      *
-     * @param  boolean $checkHeader
+     * @param  boolean $headerCheck
      * @return Zend_Validate_File_MimeType Provides a fluent interface
      */
     public function enableHeaderCheck($headerCheck = true)
@@ -318,6 +318,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      * Adds the mimetypes
      *
      * @param  string|array $mimetype The mimetypes to add for validation
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_File_Extension Provides a fluent interface
      */
     public function addMimeType($mimetype)
@@ -463,12 +464,10 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
     /**
      * Saves the provided error information by finfo_open to this instance
      *
-     * @param  integer $errno
-     * @param  string  $errstr
-     * @param  string  $errfile
-     * @param  integer $errline
-     * @param  array   $errcontext
-     * @return void
+     * @param integer $errno
+     * @param string  $errstr
+     * @param string  $errfile
+     * @param integer $errline
      */
     protected function _errorHandler($errno, $errstr, $errfile, $errline)
     {

+ 2 - 1
library/Zend/Validate/File/Sha1.php

@@ -63,7 +63,8 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash
      * $hash is the hash we accept for the file $file
      *
      * @param  string|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_File_Sha1
      */
     public function __construct($options)
     {

+ 1 - 0
library/Zend/Validate/File/Size.php

@@ -99,6 +99,7 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract
      * 'bytestring': Use bytestring or real size for messages
      *
      * @param  integer|array $options Options for the adapter
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {

+ 3 - 3
library/Zend/Validate/File/Upload.php

@@ -78,8 +78,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
      * If no files are given the $_FILES array will be used automatically.
      * NOTE: This validator will only work with HTTP POST uploads!
      *
-     * @param  array|Zend_Config $files Array of files in syntax of Zend_File_Transfer
-     * @return void
+     * @param array|Zend_Config $files Array of files in syntax of Zend_File_Transfer
      */
     public function __construct($files = array())
     {
@@ -93,7 +92,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
     /**
      * Returns the array of set files
      *
-     * @param  string $files (Optional) The file to return in detail
+     * @param  string $file (Optional) The file to return in detail
      * @return array
      * @throws Zend_Validate_Exception If file is not found
      */
@@ -157,6 +156,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
      *
      * @param  string $value Single file to check for upload errors, when giving null the $_FILES array
      *                       from initialization will be used
+     * @param  string|null   $file
      * @return boolean
      */
     public function isValid($value, $file = null)

+ 1 - 0
library/Zend/Validate/Float.php

@@ -91,6 +91,7 @@ class Zend_Validate_Float extends Zend_Validate_Abstract
      * Sets the locale to use
      *
      * @param string|Zend_Locale $locale
+     * @return $this
      */
     public function setLocale($locale = null)
     {

+ 1 - 1
library/Zend/Validate/GreaterThan.php

@@ -60,7 +60,7 @@ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  mixed|Zend_Config $min
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($min)
     {

+ 3 - 5
library/Zend/Validate/Hostname.php

@@ -1186,12 +1186,8 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param integer          $allow       OPTIONAL Set what types of hostname to allow (default ALLOW_DNS)
-     * @param boolean          $validateIdn OPTIONAL Set whether IDN domains are validated (default true)
-     * @param boolean          $validateTld OPTIONAL Set whether the TLD element of a hostname is validated (default true)
-     * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void
      * @see http://www.iana.org/cctld/specifications-policies-cctlds-01apr02.htm  Technical Specifications for ccTLDs
+     * @param array $options Validator options
      */
     public function __construct($options = array())
     {
@@ -1318,6 +1314,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * This only applies when DNS hostnames are validated
      *
      * @param boolean $allowed Set allowed to true to validate IDNs, and false to not validate them
+     * @return $this
      */
     public function setValidateIdn ($allowed)
     {
@@ -1341,6 +1338,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * This only applies when DNS hostnames are validated
      *
      * @param boolean $allowed Set allowed to true to validate TLDs, and false to not validate them
+     * @return $this
      */
     public function setValidateTld ($allowed)
     {

+ 3 - 2
library/Zend/Validate/Iban.php

@@ -132,8 +132,7 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|Zend_Config|Zend_Locale $locale OPTIONAL
-     * @return void
+     * @param string|Zend_Config|Zend_Locale $locale OPTIONAL
      */
     public function __construct($locale = null)
     {
@@ -175,6 +174,8 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract
      * Sets the locale option
      *
      * @param  string|Zend_Locale $locale
+     * @throws Zend_Locale_Exception
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Date provides a fluent interface
      */
     public function setLocale($locale = null)

+ 2 - 2
library/Zend/Validate/Identical.php

@@ -64,8 +64,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  mixed $token
-     * @return void
+     * @param mixed $token
      */
     public function __construct($token = null)
     {
@@ -121,6 +120,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract
      * Sets the strict parameter
      *
      * @param Zend_Validate_Identical
+     * @return $this
      */
     public function setStrict($strict)
     {

+ 2 - 2
library/Zend/Validate/InArray.php

@@ -65,8 +65,8 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  array|Zend_Config $haystack
-     * @return void
+     * @param array|Zend_Config $options Validator options
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {

+ 1 - 0
library/Zend/Validate/Int.php

@@ -93,6 +93,7 @@ class Zend_Validate_Int extends Zend_Validate_Abstract
      * Sets the locale to use
      *
      * @param string|Zend_Locale $locale
+     * @return $this
      */
     public function setLocale($locale = null)
     {

+ 2 - 1
library/Zend/Validate/Ip.php

@@ -57,7 +57,6 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param array $options OPTIONAL Options to set, see the manual for all available options
-     * @return void
      */
     public function __construct($options = array())
     {
@@ -91,6 +90,7 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * Sets the options for this validator
      *
      * @param array $options
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Ip
      */
     public function setOptions($options)
@@ -141,6 +141,7 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * Validates an IPv4 address
      *
      * @param string $value
+     * @return bool
      */
     protected function _validateIPv4($value) {
         $ip2long = ip2long($value);

+ 0 - 1
library/Zend/Validate/Isbn.php

@@ -67,7 +67,6 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract
      *
      * @param  Zend_Config|array $options
      * @throws Zend_Validate_Exception When $options is not valid
-     * @return void
      */
     public function __construct($options = array())
     {

+ 1 - 1
library/Zend/Validate/LessThan.php

@@ -59,7 +59,7 @@ class Zend_Validate_LessThan extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  mixed|Zend_Config $max
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($max)
     {

+ 0 - 1
library/Zend/Validate/Regex.php

@@ -64,7 +64,6 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract
      *
      * @param  string|Zend_Config $pattern
      * @throws Zend_Validate_Exception On missing 'pattern' parameter
-     * @return void
      */
     public function __construct($pattern)
     {

+ 2 - 2
library/Zend/Validate/StringLength.php

@@ -79,8 +79,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  integer|array|Zend_Config $options
-     * @return void
+     * @param integer|array|Zend_Config $options
      */
     public function __construct($options = array())
     {
@@ -194,6 +193,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
      * Sets a new encoding to use
      *
      * @param string $encoding
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_StringLength
      */
     public function setEncoding($encoding = null)