Merge pull request #9255 from MrPetovan/bug/fatal-errors

Add expected method MailBuilder->withHeaders

include/enotify.php

@@ -550,13 +550,13 @@ function notification($params)
 			'title'        => $title,
 			'body'         => $body,
 			'subject'      => $subject,
+			'headers'      => $emailBuilder->getHeaders(),
 		];
 
 		Hook::callAll('enotify_mail', $datarray);
 
-		$builder = DI::emailer()
+		$emailBuilder
-			->newNotifyMail()
+			->withHeaders($datarray['headers'])
-			->addHeaders($datarray['headers'])
 			->withRecipient($params['to_email'])
 			->forUser([
 				'uid' => $datarray['uid'],

src/Util/EMailer/MailBuilder.php

@@ -159,6 +159,36 @@ abstract class MailBuilder
 		return $this;
 	}
 
+	/**
+	 * Returns the current headers
+	 *
+	 * @return string[][]
+	 */
+	public function getHeaders()
+	{
+		return $this->headers;
+	}
+
+	/**
+	 * Sets the headers
+	 *
+	 * Expected format is
+	 * [
+	 *   'Header1' => ['value1', 'value2', ...],
+	 *   'Header2' => ['value3', 'value4', ...],
+	 *   ...
+	 * ]
+	 *
+	 * @param string[][] $headers
+	 * @return $this
+	 */
+	public function withHeaders(array $headers)
+	{
+		$this->headers = $headers;
+
+		return $this;
+	}
+
 	/**
 	 * Adds a value to a header
 	 *