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

… into hotfix/phpdoc
zendframework · Sep 10, 2012 · 721f353 · 721f353
commit 721f353
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Mailto.php b/src/Mailto.php
@@ -86,7 +86,7 @@ public function getEmail()
     /**
      * Set validator to use when validating email address
      *
-     * @param  Validator $validator
+     * @param  ValidatorInterface $validator
      * @return Mailto
      */
     public function setValidator(ValidatorInterface $validator)
@@ -101,7 +101,7 @@ public function setValidator(ValidatorInterface $validator)
      * If none is currently set, an EmailValidator instance with default options
      * will be used.
      *
-     * @return Validator
+     * @return ValidatorInterface
      */
     public function getValidator()
     {

diff --git a/src/Uri.php b/src/Uri.php
@@ -949,6 +949,7 @@ public static function encodeUserInfo($userInfo)
      * part with percent-encoded representation
      *
      * @param  string $path
+     * @throws Exception\InvalidArgumentException
      * @return string
      */
     public static function encodePath($path)