@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | } |
400 | 400 | |
401 | 401 | /** |
402 | - * @return IMailBox |
|
402 | + * @return Mailbox|null |
|
403 | 403 | */ |
404 | 404 | public function getInbox() { |
405 | 405 | $folders = $this->getSpecialFolder('inbox', false); |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | } |
717 | 717 | |
718 | 718 | /** |
719 | - * @return string|Horde_Mail_Rfc822_List |
|
719 | + * @return string |
|
720 | 720 | */ |
721 | 721 | public function getEmail() { |
722 | 722 | return $this->account->getEmail(); |
@@ -736,7 +736,7 @@ discard block |
||
736 | 736 | /** |
737 | 737 | * Factory method for creating new messages |
738 | 738 | * |
739 | - * @return OCA\Mail\Model\IMessage |
|
739 | + * @return Message |
|
740 | 740 | */ |
741 | 741 | public function newMessage() { |
742 | 742 | return new Message(); |
@@ -745,7 +745,7 @@ discard block |
||
745 | 745 | /** |
746 | 746 | * Factory method for creating new reply messages |
747 | 747 | * |
748 | - * @return OCA\Mail\Model\ReplyMessage |
|
748 | + * @return ReplyMessage |
|
749 | 749 | */ |
750 | 750 | public function newReplyMessage() { |
751 | 751 | return new ReplyMessage(); |
@@ -394,6 +394,10 @@ discard block |
||
394 | 394 | return \OC::$server->getURLGenerator()->getAbsoluteURL($htmlBodyUrl); |
395 | 395 | } |
396 | 396 | |
397 | + /** |
|
398 | + * @param integer $accountId |
|
399 | + * @param string $folderId |
|
400 | + */ |
|
397 | 401 | private function loadMultiple($accountId, $folderId, $ids) { |
398 | 402 | $mailBox = $this->getFolder($accountId, $folderId); |
399 | 403 | $account = $this->getAccount($accountId); |
@@ -415,8 +419,8 @@ discard block |
||
415 | 419 | * @param $folderId |
416 | 420 | * @param $id |
417 | 421 | * @param $m |
418 | - * @param $account |
|
419 | - * @param $mailBox |
|
422 | + * @param \OCA\Mail\Service\IAccount $account |
|
423 | + * @param IMailBox $mailBox |
|
420 | 424 | * @return mixed |
421 | 425 | */ |
422 | 426 | private function enhanceMessage($accountId, $folderId, $id, $m, $account, $mailBox) { |
@@ -207,7 +207,7 @@ |
||
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
210 | - * @return array |
|
210 | + * @return string |
|
211 | 211 | */ |
212 | 212 | public function getToList($assoc = false) { |
213 | 213 | $e = $this->getEnvelope(); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
101 | - * @param array $flags |
|
101 | + * @param string[] $flags |
|
102 | 102 | */ |
103 | 103 | public function setFlags(array $flags) { |
104 | 104 | $this->flags = $flags; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
231 | - * @return Horde_Mime_Part[] |
|
231 | + * @return File[] |
|
232 | 232 | */ |
233 | 233 | public function getAttachments() { |
234 | 234 | return $this->attachments; |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
86 | - * @param $email |
|
87 | - * @param $password |
|
88 | - * @param $name |
|
89 | - * @return MailAccount|null |
|
86 | + * @param string $email |
|
87 | + * @param string $password |
|
88 | + * @param string $name |
|
89 | + * @return null|MailAccount |
|
90 | 90 | */ |
91 | 91 | public function createAutoDetected($email, $password, $name) { |
92 | 92 | |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | * @param $email |
174 | 174 | * @param $password |
175 | 175 | * @param $name |
176 | - * @return MailAccount|null |
|
176 | + * @return null|MailAccount |
|
177 | 177 | */ |
178 | 178 | private function detectImapAndSmtp($email, $password, $name) { |
179 | 179 | $account = $this->imapServerDetector->detect($email, $password, $name); |
@@ -38,7 +38,7 @@ |
||
38 | 38 | * @param $users |
39 | 39 | * @param $password |
40 | 40 | * @param $name |
41 | - * @return null|MailAccount |
|
41 | + * @return \OCA\Mail\Db\MailAccount|null |
|
42 | 42 | */ |
43 | 43 | public function test($email, $host, $users, $password, $name) { |
44 | 44 | if (!is_array($users)) { |
@@ -70,8 +70,8 @@ |
||
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
73 | - * @param $uri |
|
74 | - * @param $context |
|
73 | + * @param HTMLPurifier_URI $uri |
|
74 | + * @param HTMLPurifier_Context $context |
|
75 | 75 | * @return HTMLPurifier_URI |
76 | 76 | */ |
77 | 77 | private function filterHttp(&$uri, $context) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
96 | - * @param $folderId |
|
96 | + * @param string $folderId |
|
97 | 97 | * @return IMailBox |
98 | 98 | */ |
99 | 99 | public function getMailbox($folderId) { |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | } |
200 | 200 | |
201 | 201 | /** |
202 | - * @param $messageId |
|
202 | + * @param string $messageId |
|
203 | 203 | * @return array |
204 | 204 | */ |
205 | 205 | public function resolve($messageId) { |
@@ -7,6 +7,9 @@ |
||
7 | 7 | |
8 | 8 | class UnifiedMailbox implements IMailBox { |
9 | 9 | |
10 | + /** |
|
11 | + * @param string $userId |
|
12 | + */ |
|
10 | 13 | public function __construct(AccountService $accountService, $userId) { |
11 | 14 | $this->accountService = $accountService; |
12 | 15 | $this->userId = $userId; |