Merge branch 'feature/phpdoc-mismatch' of https://github.com/micheh/zf2…

… into hotfix/phpdoc

src/Boolean.php

@@ -162,6 +162,7 @@ public function getCasting()
 
     /**
      * @param  array|Traversable $translations
+     * @throws Exception\InvalidArgumentException
      * @return Boolean
      */
     public function setTranslations($translations)

src/Callback.php

@@ -27,7 +27,8 @@ class Callback extends AbstractFilter
     );
 
     /**
-     * @param array|Traversable $options
+     * @param callable|array|Traversable $callbackOrOptions
+     * @param array $callbackParams
      */
     public function __construct($callbackOrOptions, $callbackParams = array())
     {
@@ -43,7 +44,8 @@ public function __construct($callbackOrOptions, $callbackParams = array())
      * Sets a new callback for this filter
      *
      * @param  callable $callback
-     * @return Callback
+     * @throws Exception\InvalidArgumentException
+     * @return self
      */
     public function setCallback($callback)
     {

src/Compress.php

@@ -54,6 +54,7 @@ public function __construct($options = null)
      * Set filter setate
      *
      * @param  array $options
+     * @throws Exception\InvalidArgumentException if options is not an array or Traversable
      * @return Compress
      */
     public function setOptions($options)
@@ -81,8 +82,9 @@ public function setOptions($options)
     /**
      * Returns the current adapter, instantiating it if necessary
      *
-     * @return string
+     * @throws Exception\RuntimeException
      * @throws Exception\InvalidArgumentException
+     * @return Compress\CompressionAlgorithmInterface
      */
     public function getAdapter()
     {

src/Compress/Bz2.php

@@ -38,6 +38,7 @@ class Bz2 extends AbstractCompressionAlgorithm
      * Class constructor
      *
      * @param null|array|\Traversable $options (Optional) Options to set
+     * @throws Exception\ExtensionNotLoadedException if bz2 extension not loaded
      */
     public function __construct($options = null)
     {
@@ -60,7 +61,8 @@ public function getBlocksize()
     /**
      * Sets a new blocksize
      *
-     * @param  integer $level
+     * @param  integer $blocksize
+     * @throws Exception\InvalidArgumentException
      * @return Bz2
      */
     public function setBlocksize($blocksize)

src/Compress/Gz.php

@@ -40,6 +40,7 @@ class Gz extends AbstractCompressionAlgorithm
      * Class constructor
      *
      * @param null|array|\Traversable $options (Optional) Options to set
+     * @throws Exception\ExtensionNotLoadedException if zlib extension not loaded
      */
     public function __construct($options = null)
     {
@@ -63,6 +64,7 @@ public function getLevel()
      * Sets a new compression level
      *
      * @param integer $level
+     * @throws Exception\InvalidArgumentException
      * @return Gz
      */
     public function setLevel($level)

src/Compress/Rar.php

@@ -42,6 +42,7 @@ class Rar extends AbstractCompressionAlgorithm
      * Class constructor
      *
      * @param array $options (Optional) Options to set
+     * @throws Exception\ExtensionNotLoadedException if rar extension not loaded
      */
     public function __construct($options = null)
     {

src/Compress/Tar.php

@@ -42,6 +42,7 @@ class Tar extends AbstractCompressionAlgorithm
      * Class constructor
      *
      * @param array $options (Optional) Options to set
+     * @throws Exception\ExtensionNotLoadedException if Archive_Tar component not available
      */
     public function __construct($options = null)
     {

src/Compress/Zip.php

@@ -40,6 +40,7 @@ class Zip extends AbstractCompressionAlgorithm
      * Class constructor
      *
      * @param  null|array|\Traversable $options (Optional) Options to set
+     * @throws Exception\ExtensionNotLoadedException if zip extension not loaded
      */
     public function __construct($options = null)
     {
@@ -87,6 +88,7 @@ public function getTarget()
      * Sets the target to use
      *
      * @param  string $target
+     * @throws Exception\InvalidArgumentException
      * @return Zip
      */
     public function setTarget($target)

src/Encrypt.php

@@ -55,6 +55,7 @@ public function getAdapter()
      *
      * @param  string|array $options (Optional) Encryption options
      * @return Encrypt
+     * @throws Exception\DomainException
      * @throws Exception\InvalidArgumentException
      */
     public function setAdapter($options = null)

src/Encrypt/BlockCipher.php

@@ -214,6 +214,7 @@ public function setCompression($compression)
      * Encrypts $value with the defined settings
      *
      * @param  string $value The content to encrypt
+     * @throws Exception\InvalidArgumentException
      * @return string The encrypted content
      */
     public function encrypt($value)

src/Encrypt/Openssl.php

@@ -242,7 +242,7 @@ public function getEnvelopeKey()
     /**
      * Sets envelope keys
      *
-     * @param  string|array $options Envelope keys
+     * @param  string|array $key Envelope keys
      * @return \Zend\Filter\Encrypt\Openssl
      */
     public function setEnvelopeKey($key)

src/FilterChain.php

@@ -128,7 +128,7 @@ public function setPluginManager(FilterPluginManager $plugins)
      *
      * @param  mixed $name
      * @param  array $options
-     * @return Filter
+     * @return FilterInterface
      */
     public function plugin($name, array $options = array())
     {
@@ -141,6 +141,7 @@ public function plugin($name, array $options = array())
      *
      * @param  callable|FilterInterface $callback A Filter implementation or valid PHP callback
      * @param  int $priority Priority at which to enqueue filter; defaults to 1000 (higher executes earlier)
+     * @throws Exception\InvalidArgumentException
      * @return FilterChain
      */
     public function attach($callback, $priority = self::DEFAULT_PRIORITY)

src/Inflector.php

@@ -151,7 +151,7 @@ public function setOptions($options)
      * Set Whether or not the inflector should throw an exception when a replacement
      * identifier is still found within an inflected target.
      *
-     * @param bool $throwTargetExceptions
+     * @param bool $throwTargetExceptionsOn
      * @return Inflector
      */
     public function setThrowTargetExceptionsOn($throwTargetExceptionsOn)
@@ -407,6 +407,7 @@ public function setStaticRuleReference($name, &$reference)
      * Inflect
      *
      * @param  string|array $source
+     * @throws Exception\RuntimeException
      * @return string
      */
     public function filter($source)

src/Null.php

@@ -50,7 +50,7 @@ class Null extends AbstractFilter
     /**
      * Constructor
      *
-     * @param string|array|Traversable $options OPTIONAL
+     * @param string|array|Traversable $typeOrOptions OPTIONAL
      */
     public function __construct($typeOrOptions = null)
     {

src/RealPath.php

@@ -10,6 +10,7 @@
 
 namespace Zend\Filter;
 
+use Traversable;
 use Zend\Stdlib\ErrorHandler;
 
 /**
@@ -28,7 +29,7 @@ class RealPath extends AbstractFilter
     /**
      * Class constructor
      *
-     * @param boolean|\Traversable $options Options to set
+     * @param boolean|Traversable $existsOrOptions Options to set
      */
     public function __construct($existsOrOptions = true)
     {

src/StringToLower.php

@@ -28,7 +28,7 @@ class StringToLower extends AbstractUnicode
     /**
      * Constructor
      *
-     * @param string|array|Traversable $options OPTIONAL
+     * @param string|array|Traversable $encodingOrOptions OPTIONAL
      */
     public function __construct($encodingOrOptions = null)
     {

src/StringToUpper.php

@@ -28,7 +28,7 @@ class StringToUpper extends AbstractUnicode
     /**
      * Constructor
      *
-     * @param string|array|Traversable $options OPTIONAL
+     * @param string|array|Traversable $encodingOrOptions OPTIONAL
      */
     public function __construct($encodingOrOptions = null)
     {

src/StringTrim.php

@@ -29,7 +29,7 @@ class StringTrim extends AbstractFilter
     /**
      * Sets filter options
      *
-     * @param  string|array|Traversable $options
+     * @param  string|array|Traversable $charlistOrOptions
      */
     public function __construct($charlistOrOptions = null)
     {

src/Word/DashToUnderscore.php

@@ -18,8 +18,6 @@ class DashToUnderscore extends SeparatorToSeparator
 {
     /**
      * Constructor
-     *
-     * @param  string $separator Space by default
      */
     public function __construct()
     {

src/Word/UnderscoreToSeparator.php

@@ -19,7 +19,7 @@ class UnderscoreToSeparator extends SeparatorToSeparator
     /**
      * Constructor
      *
-     * @param  string $separator Space by default
+     * @param  string $replacementSeparator Space by default
      */
     public function __construct($replacementSeparator = ' ')
     {