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

… into hotfix/phpdoc

src/Adapter/AbstractAdapter.php

@@ -136,6 +136,7 @@ public function writeAt($text, $x, $y, $color = null, $bgColor = null)
      * @param int      $bgColor      (optional) Background color
      * @param null|int $fillColor    (optional) Foreground color of box fill
      * @param null|int $fillBgColor  (optional) Background color of box fill
+     * @throws Exception\BadMethodCallException if coordinates are invalid
      */
     public function writeBox(
         $x1,

src/Adapter/Posix.php

@@ -213,6 +213,7 @@ public function setPos($x, $y)
      * @param  string   $string
      * @param  int      $color
      * @param  null|int $bgColor
+     * @throws Exception\BadMethodCallException
      * @return string
      */
     public function colorize($string, $color = null, $bgColor = null)
@@ -248,6 +249,7 @@ public function colorize($string, $color = null, $bgColor = null)
      * Change current drawing color.
      *
      * @param int $color
+     * @throws Exception\BadMethodCallException
      */
     public function setColor($color)
     {
@@ -269,6 +271,7 @@ public function setColor($color)
      * Change current drawing background color
      *
      * @param int $bgColor
+     * @throws Exception\BadMethodCallException
      */
     public function setBgColor($bgColor)
     {

src/Getopt.php

@@ -212,6 +212,7 @@ class Getopt
      * @param  array $rules
      * @param  array $argv
      * @param  array $getoptConfig
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($rules, $argv = null, $getoptConfig = array())
     {
@@ -312,7 +313,7 @@ public function __unset($key)
      * These are appended to those defined when the constructor was called.
      *
      * @param  array $argv
-     * @throws \Zend\Console\Exception\ExceptionInterface When not given an array as parameter
+     * @throws \Zend\Console\Exception\InvalidArgumentException When not given an array as parameter
      * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function addArguments($argv)
@@ -330,7 +331,7 @@ public function addArguments($argv)
      * These replace any currently defined.
      *
      * @param  array $argv
-     * @throws \Zend\Console\Exception\ExceptionInterface When not given an array as parameter
+     * @throws \Zend\Console\Exception\InvalidArgumentException When not given an array as parameter
      * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function setArguments($argv)
@@ -802,6 +803,7 @@ protected function _parseSingleOption($flag, &$argv)
      * or no one numeric option handlers is defined
      *
      * @param  int $value
+     * @throws Exception\RuntimeException
      * @return void
      */
     protected function _setNumericOptionValue($value)

src/Prompt/Select.php

@@ -41,6 +41,7 @@ class Select extends Char
      * @param array     $options        Allowed options
      * @param bool      $allowEmpty     Allow empty (no) selection?
      * @param bool      $echo           True to display selected option?
+     * @throws Exception\BadMethodCallException if no options available
      */
     public function __construct(
         $promptText = 'Please select one option',
@@ -121,6 +122,7 @@ public function show()
      * Set allowed options
      *
      * @param array|\Traversable $options
+     * @throws Exception\BadMethodCallException
      */
     public function setOptions($options)
     {

src/Request.php

@@ -39,7 +39,9 @@ class Request extends Message implements RequestInterface
     /**
      * Create a new CLI request
      *
-     * @param array|null $args     Console arguments. If not supplied, $_SERVER['argv'] will be used
+     * @param array|null $args Console arguments. If not supplied, $_SERVER['argv'] will be used
+     * @param array|null $env Environment data. If not supplied, $_ENV will be used
+     * @throws Exception\RuntimeException
      */
     public function __construct(array $args = null, array $env = null)
     {