Add expected method MailBuilder->withHeaders

- Address https://github.com/friendica/friendica/issues/9250#issuecomment-696055412

diff --git a/include/enotify.php b/include/enotify.php
index 478b034e5f5bdb8b353b5eb1cd46a80b94a7daae..b7fe18a18fe4b6cb9e154f9b68e20dbd592b7cce 100644 (file)
--- a/include/enotify.php
+++ b/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()
-                       ->newNotifyMail()
-                       ->addHeaders($datarray['headers'])
+               $emailBuilder
+                       ->withHeaders($datarray['headers'])
                        ->withRecipient($params['to_email'])
                        ->forUser([
                                'uid' => $datarray['uid'],

diff --git a/src/Util/EMailer/MailBuilder.php b/src/Util/EMailer/MailBuilder.php
index 24190fe4d40a06d46324b3ae4a0cd66bf93e3867..38970a612d590c2078b5f50c5d3fe350f0af145f 100644 (file)
--- a/src/Util/EMailer/MailBuilder.php
+++ b/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
         *