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

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

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Header/MessageId.php b/src/Header/MessageId.php
@@ -69,6 +69,7 @@ public function toString()
     /**
      * Set the message id
      *
+     * @param string|null $id
      * @return MessageId
      */
     public function setId($id = null)

diff --git a/src/Transport/Smtp.php b/src/Transport/Smtp.php
@@ -199,6 +199,7 @@ public function disconnect()
      * developer to add a custom adapter if required before mail is sent.
      *
      * @param Message $message
+     * @throws Exception\RuntimeException
      */
     public function send(Message $message)
     {