Fixing mailer adapter issues

softberg · Apr 21, 2023 · 976abcb · 976abcb
1 parent 28f4061
commit 976abcb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Libraries/Mailer/Adapters/MandrillAdapter.php b/src/Libraries/Mailer/Adapters/MandrillAdapter.php
@@ -65,7 +65,7 @@ private function __construct(array $params)
     {
         $this->httpClient = new HttpClient();
 
-        $this->apiKey = $params['api_key'];
+        $this->data['key'] = $params['api_key'];
     }
 
     /**

diff --git a/src/Libraries/Mailer/Adapters/SendgridAdapter.php b/src/Libraries/Mailer/Adapters/SendgridAdapter.php
@@ -87,9 +87,7 @@ public static function getInstance(array $params): SendgridAdapter
      */
     private function prepare()
     {
-        $this->data['from'] = [
-            'email' => $this->from['email']
-        ];
+        $this->data['from'] = $this->from;
 
         $this->data['personalizations'] = [
             ['to' => $this->addresses]
@@ -107,8 +105,10 @@ private function prepare()
             }
 
             $this->data['content'] = [
-                'type' => 'text/html',
-                'value' => trim(str_replace("\n", "", $body))
+                [
+                    'type' => 'text/html',
+                    'value' => trim(str_replace("\n", "", $body))
+                ]
             ];
         }
     }

diff --git a/src/Libraries/Mailer/Adapters/SmtpAdapter.php b/src/Libraries/Mailer/Adapters/SmtpAdapter.php
@@ -258,7 +258,7 @@ private function prepare()
                 $body = is_array($this->message) ? implode($this->message) : $this->message;
             }
 
-            $this->mailer->Body = $body;
+            $this->mailer->Body = trim(str_replace("\n", "", $body));
         }
 
         $this->fillProperties('addAddress', $this->addresses);