Merge branch 'master' of https://github.com/zendframework/zf2

src/Password/Apache.php

@@ -154,7 +154,7 @@ public function verify($password, $hash)
     /**
      * Set the format of the password
      *
-     * @param  integer|string                     $cost
+     * @param  string $format
      * @throws Exception\InvalidArgumentException
      * @return Apache
      */
@@ -242,7 +242,8 @@ protected function toAlphabet64($value)
     /**
      * APR1 MD5 algorithm
      *
-     * @param  string $password
+     * @param  string      $password
+     * @param  null|string $salt
      * @return string
      */
     protected function apr1Md5($password, $salt = null)