Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
This commit is contained in:
Родитель
fba6a34240
Коммит
40169e4ed8
|
@ -85,7 +85,7 @@ class MessagesController extends Controller {
|
||||||
* @param string $appName
|
* @param string $appName
|
||||||
* @param IRequest $request
|
* @param IRequest $request
|
||||||
* @param AccountService $accountService
|
* @param AccountService $accountService
|
||||||
* @param $UserId
|
* @param string $UserId
|
||||||
* @param $userFolder
|
* @param $userFolder
|
||||||
* @param ContactsIntegration $contactsIntegration
|
* @param ContactsIntegration $contactsIntegration
|
||||||
* @param Logger $logger
|
* @param Logger $logger
|
||||||
|
@ -427,6 +427,10 @@ class MessagesController extends Controller {
|
||||||
return \OC::$server->getURLGenerator()->getAbsoluteURL($htmlBodyUrl);
|
return \OC::$server->getURLGenerator()->getAbsoluteURL($htmlBodyUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param integer $accountId
|
||||||
|
* @param string $folderId
|
||||||
|
*/
|
||||||
private function loadMultiple($accountId, $folderId, $ids) {
|
private function loadMultiple($accountId, $folderId, $ids) {
|
||||||
$messages = array_map(function($id) use ($accountId, $folderId){
|
$messages = array_map(function($id) use ($accountId, $folderId){
|
||||||
try {
|
try {
|
||||||
|
@ -445,7 +449,7 @@ class MessagesController extends Controller {
|
||||||
* @param $id
|
* @param $id
|
||||||
* @param $m
|
* @param $m
|
||||||
* @param IAccount $account
|
* @param IAccount $account
|
||||||
* @param $mailBox
|
* @param IMailBox $mailBox
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
private function enhanceMessage($accountId, $folderId, $id, $m, IAccount $account, $mailBox) {
|
private function enhanceMessage($accountId, $folderId, $id, $m, IAccount $account, $mailBox) {
|
||||||
|
|
|
@ -232,7 +232,7 @@ class IMAPMessage implements IMessage {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getToList($assoc = false) {
|
public function getToList($assoc = false) {
|
||||||
$e = $this->getEnvelope();
|
$e = $this->getEnvelope();
|
||||||
|
|
|
@ -115,7 +115,7 @@ class Message implements IMessage {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $flags
|
* @param string[] $flags
|
||||||
*/
|
*/
|
||||||
public function setFlags(array $flags) {
|
public function setFlags(array $flags) {
|
||||||
$this->flags = $flags;
|
$this->flags = $flags;
|
||||||
|
@ -245,7 +245,7 @@ class Message implements IMessage {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Horde_Mime_Part[]
|
* @return File[]
|
||||||
*/
|
*/
|
||||||
public function getAttachments() {
|
public function getAttachments() {
|
||||||
return $this->attachments;
|
return $this->attachments;
|
||||||
|
|
|
@ -60,7 +60,7 @@ class AutoConfig {
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param Logger $logger
|
* @param Logger $logger
|
||||||
* @param string $userId
|
* @param string $UserId
|
||||||
* @param MozillaIspDb $mozillaIspDb
|
* @param MozillaIspDb $mozillaIspDb
|
||||||
* @param MxRecord $mxRecord
|
* @param MxRecord $mxRecord
|
||||||
* @param ImapConnectivityTester $imapTester
|
* @param ImapConnectivityTester $imapTester
|
||||||
|
@ -88,10 +88,10 @@ class AutoConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $email
|
* @param string $email
|
||||||
* @param $password
|
* @param string $password
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @return MailAccount|null
|
* @return null|MailAccount
|
||||||
*/
|
*/
|
||||||
public function createAutoDetected($email, $password, $name) {
|
public function createAutoDetected($email, $password, $name) {
|
||||||
|
|
||||||
|
@ -178,7 +178,7 @@ class AutoConfig {
|
||||||
* @param $email
|
* @param $email
|
||||||
* @param $password
|
* @param $password
|
||||||
* @param $name
|
* @param $name
|
||||||
* @return MailAccount|null
|
* @return null|MailAccount
|
||||||
*/
|
*/
|
||||||
private function detectImapAndSmtp($email, $password, $name) {
|
private function detectImapAndSmtp($email, $password, $name) {
|
||||||
$account = $this->imapServerDetector->detect($email, $password, $name);
|
$account = $this->imapServerDetector->detect($email, $password, $name);
|
||||||
|
|
|
@ -46,7 +46,7 @@ class ImapConnectivityTester extends ConnectivityTester {
|
||||||
* @param $users
|
* @param $users
|
||||||
* @param $password
|
* @param $password
|
||||||
* @param $name
|
* @param $name
|
||||||
* @return null|MailAccount
|
* @return \OCA\Mail\Db\MailAccount|null
|
||||||
*/
|
*/
|
||||||
public function test($email, $host, $users, $password, $name) {
|
public function test($email, $host, $users, $password, $name) {
|
||||||
if (!is_array($users)) {
|
if (!is_array($users)) {
|
||||||
|
|
|
@ -85,8 +85,8 @@ class TransformURLScheme extends HTMLPurifier_URIFilter {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $uri
|
* @param HTMLPurifier_URI $uri
|
||||||
* @param $context
|
* @param \HTMLPurifier_Context $context
|
||||||
* @return HTMLPurifier_URI
|
* @return HTMLPurifier_URI
|
||||||
*/
|
*/
|
||||||
private function filterHttp(&$uri, $context) {
|
private function filterHttp(&$uri, $context) {
|
||||||
|
|
|
@ -223,7 +223,7 @@ class UnifiedAccount implements IAccount {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $messageId
|
* @param string $messageId
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function resolve($messageId) {
|
public function resolve($messageId) {
|
||||||
|
|
|
@ -25,6 +25,9 @@ use OCA\Mail\Message;
|
||||||
|
|
||||||
class UnifiedMailbox implements IMailBox {
|
class UnifiedMailbox implements IMailBox {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $userId
|
||||||
|
*/
|
||||||
public function __construct(AccountService $accountService, $userId) {
|
public function __construct(AccountService $accountService, $userId) {
|
||||||
$this->accountService = $accountService;
|
$this->accountService = $accountService;
|
||||||
$this->userId = $userId;
|
$this->userId = $userId;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче