Merge pull request #38585 from nextcloud/feature/ocp/send-message-with-subject-body

feat(ocp): Allow sending emails with subject and body

2 files changed, 30 insertions, 13 deletions

diff --git a/lib/private/Mail/Message.php b/lib/private/Mail/Message.php
index 35d6f96d33a..016340c9692 100644
--- a/lib/private/Mail/Message.php
+++ b/lib/private/Mail/Message.php
@@ -207,11 +207,6 @@ class Message implements IMessage {
 		return $this->bcc;
 	}
 
-	/**
-	 * Set the subject of this message.
-	 *
-	 * @return $this
-	 */
 	public function setSubject(string $subject): IMessage {
 		$this->symfonyEmail->subject($subject);
 		return $this;
@@ -224,10 +219,6 @@ class Message implements IMessage {
 		return $this->symfonyEmail->getSubject() ?? '';
 	}
 
-	/**
-	 * Set the plain-text body of this message.
-	 * @return $this
-	 */
 	public function setPlainBody(string $body): IMessage {
 		$this->symfonyEmail->text($body);
 		return $this;
@@ -242,10 +233,6 @@ class Message implements IMessage {
 		return $body;
 	}
 
-	/**
-	 * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
-	 * @return $this
-	 */
 	public function setHtmlBody(string $body): IMessage {
 		if (!$this->plainTextOnly) {
 			$this->symfonyEmail->html($body);
diff --git a/lib/public/Mail/IMessage.php b/lib/public/Mail/IMessage.php
index 08545138d37..bd96918c7ac 100644
--- a/lib/public/Mail/IMessage.php
+++ b/lib/public/Mail/IMessage.php
@@ -33,6 +33,36 @@ namespace OCP\Mail;
  */
 interface IMessage {
 	/**
+	 * Set the subject of this message
+	 *
+	 * @param string $subject
+	 *
+	 * @return self
+	 * @since 28.0.0
+	 */
+	public function setSubject(string $subject): IMessage;
+
+	/**
+	 * Set the plain-text body of this message
+	 *
+	 * @param string $body
+	 *
+	 * @return self
+	 * @since 28.0.0
+	 */
+	public function setPlainBody(string $body): IMessage;
+
+	/**
+	 * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
+	 *
+	 * @param string $body
+	 *
+	 * @return self
+	 * @since 28.0.0
+	 */
+	public function setHtmlBody(string $body): IMessage;
+
+	/**
 	 * @param IAttachment $attachment
 	 * @return IMessage
 	 * @since 13.0.0