Skip to content

Fix psalm errors part 4 #3782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Oct 13, 2020
Merged

Fix psalm errors part 4 #3782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/IMAP/Sync/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@

class Response implements JsonSerializable {

/** @var IMAPMessage|Message[] */
/** @var IMAPMessage[]|Message[] */
private $newMessages;

/** @var IMAPMessage|Message[] */
/** @var IMAPMessage[]|Message[] */
private $changedMessages;

/** @var int[] */
private $vanishedMessageUids;

/**
* @param string $syncToken
* @param IMAPMessage|Message[] $newMessages
* @param IMAPMessage|Message[] $changedMessages
* @param IMAPMessage[]|Message[] $newMessages
* @param IMAPMessage[]|Message[] $changedMessages
* @param int[] $vanishedMessageUids
*/
public function __construct(array $newMessages = [],
Expand All @@ -53,14 +53,14 @@ public function __construct(array $newMessages = [],
}

/**
* @return IMAPMessage|Message[]
* @return IMAPMessage[]|Message[]
*/
public function getNewMessages(): array {
return $this->newMessages;
}

/**
* @return IMAPMessage|Message[]
* @return IMAPMessage[]|Message[]
*/
public function getChangedMessages(): array {
return $this->changedMessages;
Expand Down
12 changes: 6 additions & 6 deletions lib/Model/NewMessageData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class NewMessageData {
/** @var string */
private $subject;

/** @var string|null */
/** @var string */
private $body;

/** @var array */
Expand All @@ -61,7 +61,7 @@ class NewMessageData {
* @param AddressList $cc
* @param AddressList $bcc
* @param string $subject
* @param string|null $body
* @param string $body
* @param array $attachments
* @package bool $isHtml
*/
Expand All @@ -70,7 +70,7 @@ public function __construct(Account $account,
AddressList $cc,
AddressList $bcc,
string $subject,
string $body = null,
string $body,
array $attachments = [],
bool $isHtml = true) {
$this->account = $account;
Expand Down Expand Up @@ -99,7 +99,7 @@ public static function fromRequest(Account $account,
string $cc = null,
string $bcc = null,
string $subject,
string $body = null,
string $body,
array $attachments = [],
bool $isHtml = true) {
$toList = AddressList::parse($to ?: '');
Expand Down Expand Up @@ -145,9 +145,9 @@ public function getSubject(): string {
}

/**
* @return string|null
* @return string
*/
public function getBody() {
public function getBody(): string {
return $this->body;
}

Expand Down