Add psalm and apply auto fixes

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

4 files changed, 57 insertions, 8 deletions

diff --git a/lib/Model/IMAPMessage.php b/lib/Model/IMAPMessage.php
index 62efeea81..1e847f1e6 100644
--- a/lib/Model/IMAPMessage.php
+++ b/lib/Model/IMAPMessage.php
@@ -149,6 +149,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param array $flags
 	 *
 	 * @throws Exception
+	 *
+	 * @return void
 	 */
 	public function setFlags(array $flags) {
 		// TODO: implement
@@ -173,6 +175,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param AddressList $from
 	 *
 	 * @throws Exception
+	 *
+	 * @return void
 	 */
 	public function setFrom(AddressList $from) {
 		throw new Exception('IMAP message is immutable');
@@ -189,6 +193,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param AddressList $to
 	 *
 	 * @throws Exception
+	 *
+	 * @return void
 	 */
 	public function setTo(AddressList $to) {
 		throw new Exception('IMAP message is immutable');
@@ -205,6 +211,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param AddressList $cc
 	 *
 	 * @throws Exception
+	 *
+	 * @return void
 	 */
 	public function setCC(AddressList $cc) {
 		throw new Exception('IMAP message is immutable');
@@ -221,6 +229,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param AddressList $bcc
 	 *
 	 * @throws Exception
+	 *
+	 * @return void
 	 */
 	public function setBcc(AddressList $bcc) {
 		throw new Exception('IMAP message is immutable');
@@ -246,6 +256,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param string $subject
 	 *
 	 * @throws Exception
+	 *
+	 * @return void
 	 */
 	public function setSubject(string $subject) {
 		throw new Exception('IMAP message is immutable');
@@ -295,7 +307,7 @@ class IMAPMessage implements IMessage, JsonSerializable {
 		return false;
 	}
 
-	private function loadMessageBodies() {
+	private function loadMessageBodies(): void {
 		$fetch_query = new Horde_Imap_Client_Fetch_Query();
 		$fetch_query->envelope();
 		$fetch_query->structure();
@@ -339,8 +351,10 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param mixed $partNo
 	 *
 	 * @throws DoesNotExistException
+	 *
+	 * @return void
 	 */
-	private function getPart(Horde_Mime_Part $p, $partNo) {
+	private function getPart(Horde_Mime_Part $p, $partNo): void {
 		// ATTACHMENT
 		// Any part with a filename is an attachment,
 		// so an attached text file (type 0) is not mistaken as the message.
@@ -470,8 +484,10 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param mixed $partNo
 	 *
 	 * @throws DoesNotExistException
+	 *
+	 * @return void
 	 */
-	private function handleMultiPartMessage(Horde_Mime_Part $part, $partNo) {
+	private function handleMultiPartMessage(Horde_Mime_Part $part, $partNo): void {
 		$i = 1;
 		foreach ($part->getParts() as $p) {
 			$this->getPart($p, "$partNo.$i");
@@ -484,8 +500,10 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param mixed $partNo
 	 *
 	 * @throws DoesNotExistException
+	 *
+	 * @return void
 	 */
-	private function handleTextMessage(Horde_Mime_Part $p, $partNo) {
+	private function handleTextMessage(Horde_Mime_Part $p, $partNo): void {
 		$data = $this->loadBodyData($p, $partNo);
 		$this->plainMessage .= trim($data) . "\n\n";
 	}
@@ -495,8 +513,10 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @param mixed $partNo
 	 *
 	 * @throws DoesNotExistException
+	 *
+	 * @return void
 	 */
-	private function handleHtmlMessage(Horde_Mime_Part $p, $partNo) {
+	private function handleHtmlMessage(Horde_Mime_Part $p, $partNo): void {
 		$this->hasHtmlMessage = true;
 		if ($this->loadHtmlMessage) {
 			$data = $this->loadBodyData($p, $partNo);
@@ -550,6 +570,9 @@ class IMAPMessage implements IMessage, JsonSerializable {
 		return $this->getPlainBody();
 	}
 
+	/**
+	 * @return void
+	 */
 	public function setContent(string $content) {
 		throw new Exception('IMAP message is immutable');
 	}
@@ -570,6 +593,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 
 	/**
 	 * @param File $file
+	 *
+	 * @return void
 	 */
 	public function addAttachmentFromFiles(File $file) {
 		throw new Exception('IMAP message is immutable');
@@ -578,6 +603,8 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	/**
 	 * @param LocalAttachment $attachment
 	 * @param ISimpleFile $file
+	 *
+	 * @return void
 	 */
 	public function addLocalAttachment(LocalAttachment $attachment, ISimpleFile $file) {
 		throw new Exception('IMAP message is immutable');
@@ -591,7 +618,9 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	}
 
 	/**
-	 * @param IMessage $message
+	 * @param string $message
+	 *
+	 * @return void
 	 */
 	public function setInReplyTo(string $message) {
 		throw new Exception('not implemented');
diff --git a/lib/Model/IMessage.php b/lib/Model/IMessage.php
index 86fb012ba..2f9385ee9 100644
--- a/lib/Model/IMessage.php
+++ b/lib/Model/IMessage.php
@@ -56,7 +56,7 @@ interface IMessage {
 	public function getFrom(): AddressList;
 
 	/**
-	 * @param string $from
+	 * @param AddressList $from
 	 */
 	public function setFrom(AddressList $from);
 
diff --git a/lib/Model/Message.php b/lib/Model/Message.php
index 24ee07128..3dae4b736 100644
--- a/lib/Model/Message.php
+++ b/lib/Model/Message.php
@@ -91,6 +91,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param string[] $flags
+	 *
+	 * @return void
 	 */
 	public function setFlags(array $flags) {
 		$this->flags = $flags;
@@ -105,6 +107,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param AddressList $from
+	 *
+	 * @return void
 	 */
 	public function setFrom(AddressList $from) {
 		$this->from = $from;
@@ -119,6 +123,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param AddressList $to
+	 *
+	 * @return void
 	 */
 	public function setTo(AddressList $to) {
 		$this->to = $to;
@@ -133,6 +139,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param AddressList $cc
+	 *
+	 * @return void
 	 */
 	public function setCC(AddressList $cc) {
 		$this->cc = $cc;
@@ -147,6 +155,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param AddressList $bcc
+	 *
+	 * @return void
 	 */
 	public function setBcc(AddressList $bcc) {
 		$this->bcc = $bcc;
@@ -161,6 +171,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param IMessage $message
+	 *
+	 * @return void
 	 */
 	public function setInReplyTo(string $id) {
 		$this->inReplyTo = $id;
@@ -175,6 +187,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param string $subject
+	 *
+	 * @return void
 	 */
 	public function setSubject(string $subject) {
 		$this->subject = $subject;
@@ -189,6 +203,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param string $content
+	 *
+	 * @return void
 	 */
 	public function setContent(string $content) {
 		$this->content = $content;
@@ -210,6 +226,8 @@ class Message implements IMessage {
 
 	/**
 	 * @param File $file
+	 *
+	 * @return void
 	 */
 	public function addAttachmentFromFiles(File $file) {
 		$part = new Horde_Mime_Part();
@@ -224,6 +242,8 @@ class Message implements IMessage {
 	/**
 	 * @param LocalAttachment $attachment
 	 * @param ISimpleFile $file
+	 *
+	 * @return void
 	 */
 	public function addLocalAttachment(LocalAttachment $attachment, ISimpleFile $file) {
 		$part = new Horde_Mime_Part();
diff --git a/lib/Model/NewMessageData.php b/lib/Model/NewMessageData.php
index 882943d39..9f37f5e36 100644
--- a/lib/Model/NewMessageData.php
+++ b/lib/Model/NewMessageData.php
@@ -91,7 +91,7 @@ class NewMessageData {
 	 * @param string|null $bcc
 	 * @param string $subject
 	 * @param string $body
-	 * @param array|null $attachments
+	 * @param array $attachments
 	 *
 	 * @return NewMessageData
 	 */