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

… into hotfix/phpdoc

src/Config/SessionConfig.php

@@ -76,7 +76,7 @@ class SessionConfig extends StandardConfig
      *
      * @param  string $storageName
      * @param  mixed $storageValue
-     * @return SessionConfiguration
+     * @return SessionConfig
      */
     public function setStorageOption($storageName, $storageValue)
     {
@@ -129,7 +129,7 @@ public function getStorageOption($storageOption)
      * Set session.save_handler
      *
      * @param  string $phpSaveHandler
-     * @return SessionConfiguration
+     * @return SessionConfig
      * @throws Exception\InvalidArgumentException
      */
     public function setPhpSaveHandler($phpSaveHandler)
@@ -152,7 +152,7 @@ public function setPhpSaveHandler($phpSaveHandler)
      * Set session.serialize_handler
      *
      * @param  string $serializeHandler
-     * @return SessionConfiguration
+     * @return SessionConfig
      * @throws Exception\InvalidArgumentException
      */
     public function setSerializeHandler($serializeHandler)
@@ -176,7 +176,7 @@ public function setSerializeHandler($serializeHandler)
      * Set cache limiter
      *
      * @param $cacheLimiter
-     * @return SessionConfiguration
+     * @return SessionConfig
      * @throws Exception\InvalidArgumentException
      */
     public function setCacheLimiter($cacheLimiter)
@@ -194,7 +194,7 @@ public function setCacheLimiter($cacheLimiter)
      * Set session.hash_function
      *
      * @param  string|int $hashFunction
-     * @return SessionConfiguration
+     * @return SessionConfig
      * @throws Exception\InvalidArgumentException
      */
     public function setHashFunction($hashFunction)
@@ -214,7 +214,7 @@ public function setHashFunction($hashFunction)
      * Set session.hash_bits_per_character
      *
      * @param  int $hashBitsPerCharacter
-     * @return SessionConfiguration
+     * @return SessionConfig
      * @throws Exception\InvalidArgumentException
      */
     public function setHashBitsPerCharacter($hashBitsPerCharacter)

src/Container.php

@@ -507,6 +507,7 @@ public function setExpirationSeconds($ttl, $vars = null)
      *
      * @param  int $hops
      * @param  null|string|array $vars
+     * @throws Exception\InvalidArgumentException
      * @return Container
      */
     public function setExpirationHops($hops, $vars = null)
@@ -550,4 +551,4 @@ public function setExpirationHops($hops, $vars = null)
         );
         return $this;
     }
-}
+}