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

… into hotfix/phpdoc

src/AbstractAdapter.php

@@ -101,6 +101,7 @@ public function setOption($key, $value)
      * Set object state from options array
      *
      * @param  array|Traversable $options
+     * @throws Exception\InvalidArgumentException
      * @return AbstractAdapter
      */
     public function setOptions($options = array())

src/AbstractWord.php

@@ -208,7 +208,7 @@ public function getTimeout()
     /**
      * Sets if session should be preserved on generate()
      *
-     * @param $keepSession Should session be kept on generate()?
+     * @param bool $keepSession Should session be kept on generate()?
      * @return AbstractWord
      */
     public function setKeepSession($keepSession)
@@ -242,6 +242,7 @@ public function setUseNumbers($useNumbers)
     /**
      * Get session object
      *
+     * @throws Exception\InvalidArgumentException
      * @return Container
      */
     public function getSession()
@@ -359,6 +360,7 @@ protected function generateRandomId()
      *
      * @see    Zend\Validator\ValidatorInterface::isValid()
      * @param  mixed $value
+     * @param  mixed $context
      * @return bool
      */
     public function isValid($value, $context = null)

src/Image.php

@@ -123,6 +123,7 @@ class Image extends AbstractWord
      * Constructor
      *
      * @param  array|\Traversable $options
+     * @throws Exception\ExtensionNotLoadedException
      */
     public function __construct($options = null)
     {
@@ -474,6 +475,8 @@ public function generate()
      *
      * @param string $id Captcha ID
      * @param string $word Captcha word
+     * @throws Exception\NoFontProvidedException if no font was set
+     * @throws Exception\ImageNotLoadableException if start image cannot be loaded
      */
     protected function generateImage($id, $word)
     {

src/ReCaptcha.php

@@ -198,6 +198,7 @@ public function generate()
      *
      * @see    \Zend\Validator\ValidatorInterface::isValid()
      * @param  mixed $value
+     * @param  mixed $context
      * @return boolean
      */
     public function isValid($value, $context = null)