@@ -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; |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | /** |
| 427 | - * @return IMailBox |
|
| 427 | + * @return Mailbox|null |
|
| 428 | 428 | */ |
| 429 | 429 | public function getInbox() { |
| 430 | 430 | $folders = $this->getSpecialFolder('inbox', false); |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | /** |
| 744 | - * @return string|Horde_Mail_Rfc822_List |
|
| 744 | + * @return string |
|
| 745 | 745 | */ |
| 746 | 746 | public function getEmail() { |
| 747 | 747 | return $this->account->getEmail(); |
@@ -390,6 +390,10 @@ discard block |
||
| 390 | 390 | return \OC::$server->getURLGenerator()->getAbsoluteURL($htmlBodyUrl); |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | + /** |
|
| 394 | + * @param integer $accountId |
|
| 395 | + * @param string $folderId |
|
| 396 | + */ |
|
| 393 | 397 | private function loadMultiple($accountId, $folderId, $ids) { |
| 394 | 398 | $mailBox = $this->getFolder($accountId, $folderId); |
| 395 | 399 | $account = $this->getAccount($accountId); |
@@ -410,9 +414,9 @@ discard block |
||
| 410 | 414 | * @param $accountId |
| 411 | 415 | * @param $folderId |
| 412 | 416 | * @param $id |
| 413 | - * @param $m |
|
| 414 | - * @param $account |
|
| 415 | - * @param $mailBox |
|
| 417 | + * @param \OCA\Mail\Message $m |
|
| 418 | + * @param \OCA\Mail\Service\IAccount $account |
|
| 419 | + * @param IMailBox $mailBox |
|
| 416 | 420 | * @return mixed |
| 417 | 421 | */ |
| 418 | 422 | private function enhanceMessage($accountId, $folderId, $id, $m, $account, $mailBox) { |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace OCA\Mail\Controller; |
| 14 | 14 | |
| 15 | -use Horde_Imap_Client; |
|
| 16 | 15 | use OCA\Mail\Http\AttachmentDownloadResponse; |
| 17 | 16 | use OCA\Mail\Http\HtmlResponse; |
| 18 | 17 | use OCA\Mail\Service\AccountService; |
@@ -101,6 +101,9 @@ |
||
| 101 | 101 | return $this->fetch->getUid(); |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | + /** |
|
| 105 | + * @param string $uid |
|
| 106 | + */ |
|
| 104 | 107 | public function setUid($uid) { |
| 105 | 108 | $this->uid = $uid; |
| 106 | 109 | $this->attachments = array_map(function($attachment) use ($uid) { |
@@ -36,6 +36,7 @@ discard block |
||
| 36 | 36 | * @param Logger $logger |
| 37 | 37 | * @param string $userId |
| 38 | 38 | * @param ICrypto $crypto |
| 39 | + * @param boolean $testSmtp |
|
| 39 | 40 | */ |
| 40 | 41 | public function __construct(Logger $logger, $userId, ICrypto $crypto, $testSmtp) { |
| 41 | 42 | $this->logger = $logger; |
@@ -146,9 +147,9 @@ discard block |
||
| 146 | 147 | } |
| 147 | 148 | |
| 148 | 149 | /** |
| 149 | - * @param $email |
|
| 150 | - * @param $password |
|
| 151 | - * @param $name |
|
| 150 | + * @param string $email |
|
| 151 | + * @param string $password |
|
| 152 | + * @param string $name |
|
| 152 | 153 | * @return MailAccount|null |
| 153 | 154 | */ |
| 154 | 155 | public function createAutoDetected($email, $password, $name) { |