| @@ -408,6 +408,10 @@ | ||
| 408 | 408 | return \OC::$server->getURLGenerator()->getAbsoluteURL($htmlBodyUrl); | 
| 409 | 409 | } | 
| 410 | 410 | |
| 411 | + /** | |
| 412 | + * @param integer $accountId | |
| 413 | + * @param string $folderId | |
| 414 | + */ | |
| 411 | 415 |  	private function loadMultiple($accountId, $folderId, $ids) { | 
| 412 | 416 |  		$messages = array_map(function($id) use ($accountId, $folderId){ | 
| 413 | 417 |  			try { | 
| @@ -43,7 +43,7 @@ | ||
| 43 | 43 | * @param string $appName | 
| 44 | 44 | * @param IRequest $request | 
| 45 | 45 | * @param AccountService $accountService | 
| 46 | - * @param $UserId | |
| 46 | + * @param string $UserId | |
| 47 | 47 | */ | 
| 48 | 48 |  	public function __construct($appName, IRequest $request, AccountService $accountService, $UserId) { | 
| 49 | 49 | parent::__construct($appName, $request); | 
| @@ -43,7 +43,7 @@ | ||
| 43 | 43 | * @param string $appName | 
| 44 | 44 | * @param IRequest $request | 
| 45 | 45 | * @param AccountService $accountService | 
| 46 | - * @param $UserId | |
| 46 | + * @param string $UserId | |
| 47 | 47 | */ | 
| 48 | 48 |  	public function __construct($appName, IRequest $request, AccountService $accountService, $UserId) { | 
| 49 | 49 | parent::__construct($appName, $request); | 
| @@ -65,7 +65,6 @@ | ||
| 65 | 65 | * Find and return all known and matching email addresses | 
| 66 | 66 | * | 
| 67 | 67 | * @param Horde_Mail_Rfc822_Address[] $term | 
| 68 | - * @param string $UserId | |
| 69 | 68 | */ | 
| 70 | 69 |  	public function searchAddress($term) { | 
| 71 | 70 |  		$this->logger->debug("searching for collected address <$term>"); | 
| @@ -65,7 +65,6 @@ | ||
| 65 | 65 | * Find and return all known and matching email addresses | 
| 66 | 66 | * | 
| 67 | 67 | * @param Horde_Mail_Rfc822_Address[] $term | 
| 68 | - * @param string $UserId | |
| 69 | 68 | */ | 
| 70 | 69 |  	public function searchAddress($term) { | 
| 71 | 70 |  		$this->logger->debug("searching for collected address <$term>"); | 
| @@ -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(); | 
| @@ -48,7 +48,6 @@ | ||
| 48 | 48 | use OCA\Mail\Model\IMessage; | 
| 49 | 49 | use OCA\Mail\Model\Message; | 
| 50 | 50 | use OCA\Mail\Model\ReplyMessage; | 
| 51 | -use OCA\Mail\Service\AutoCompletion\AddressCollector; | |
| 52 | 51 | use OCA\Mail\Service\IAccount; | 
| 53 | 52 | use OCA\Mail\Service\IMailBox; | 
| 54 | 53 | use OCP\IConfig; | 
| @@ -175,9 +175,9 @@ | ||
| 175 | 175 | } | 
| 176 | 176 | |
| 177 | 177 | /** | 
| 178 | - * @param $email | |
| 179 | - * @param $password | |
| 180 | - * @param $name | |
| 178 | + * @param string $email | |
| 179 | + * @param string $password | |
| 180 | + * @param string $name | |
| 181 | 181 | * @return null|MailAccount | 
| 182 | 182 | */ | 
| 183 | 183 |  	private function detectImapAndSmtp($email, $password, $name) { | 
| @@ -40,12 +40,14 @@ | ||
| 40 | 40 | |
| 41 | 41 | /** | 
| 42 | 42 | * @param Logger $logger | 
| 43 | - * @param string[] $ispUrls | |
| 44 | 43 | */ | 
| 45 | 44 |  	public function __construct(Logger $logger) { | 
| 46 | 45 | $this->logger = $logger; | 
| 47 | 46 | } | 
| 48 | 47 | |
| 48 | + /** | |
| 49 | + * @param string $url | |
| 50 | + */ | |
| 49 | 51 |  	private function queryUrl($url) { | 
| 50 | 52 |  		try { | 
| 51 | 53 | $xml = @simplexml_load_file($url); |