Merge pull request #3782 from nextcloud/techdept/psalm-errors-4

Fix psalm errors part 4

lib/IMAP/Sync/Response.php

@@ -29,10 +29,10 @@ use OCA\Mail\Model\IMAPMessage;
 
 class Response implements JsonSerializable {
 
-	/** @var IMAPMessage|Message[] */
+	/** @var IMAPMessage[]|Message[] */
 	private $newMessages;
 
-	/** @var IMAPMessage|Message[] */
+	/** @var IMAPMessage[]|Message[] */
 	private $changedMessages;
 
 	/** @var int[] */
@@ -40,8 +40,8 @@ class Response implements JsonSerializable {
 
 	/**
 	 * @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 = [],
@@ -53,14 +53,14 @@ class Response implements JsonSerializable {
 	}
 
 	/**
-	 * @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;

lib/Model/NewMessageData.php

@@ -46,7 +46,7 @@ class NewMessageData {
 	/** @var string */
 	private $subject;
 
-	/** @var string|null */
+	/** @var string */
 	private $body;
 
 	/** @var array */
@@ -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
 	 */
@@ -70,7 +70,7 @@ class NewMessageData {
 								AddressList $cc,
 								AddressList $bcc,
 								string $subject,
-								string $body = null,
+								string $body,
 								array $attachments = [],
 								bool $isHtml = true) {
 		$this->account = $account;
@@ -99,7 +99,7 @@ class NewMessageData {
 									   string $cc = null,
 									   string $bcc = null,
 									   string $subject,
-									   string $body = null,
+									   string $body,
 									   array $attachments = [],
 									   bool $isHtml = true) {
 		$toList = AddressList::parse($to ?: '');
@@ -145,9 +145,9 @@ class NewMessageData {
 	}
 
 	/**
-	 * @return string|null
+	 * @return string
 	 */
-	public function getBody() {
+	public function getBody(): string {
 		return $this->body;
 	}