wip

brendt · brendt · commit 03e98a4010bb · 2025-05-09T09:10:05.000+02:00
diff --git a/packages/mailer/src/Mailer.php b/packages/mailer/src/Mailer.php
@@ -16,9 +16,9 @@ public function send(string $path, ...$params): void
     {
         $html = $this->renderer->render(view($path, ...$params));
 
-        [$header, $body] = explode(PHP_EOL, $html, 2);
+        [$headerString, $body] = explode(PHP_EOL, $html, 2);
 
-        $email = $this->makeEmail($header, $body);
+        $email = $this->makeEmail($headerString, $body);
 
         $this->sendEmail($email);
     }
@@ -32,26 +32,17 @@ public function sendEmail(Email $email): void
         ld($email);
     }
 
-    private function makeEmail(string $header, string $body): Email
+    private function makeEmail(string $headerString, string $body): Email
     {
         $parsedHeaders = [];
 
-        $headers = explode(';', $header);
+        preg_match_all('/(?<header>\w+)="(?<value>.*?)"/', $headerString, $headers);
 
-        foreach ($headers as $header) {
-            if (trim($header) === '') {
-                continue;
-            }
+        foreach ($headers[0] as $i => $line) {
+            $header = $headers['header'][$i];
+            $value = $headers['value'][$i];
 
-            [$name, $value] = explode(':', $header);
-
-            $value = trim($value);
-
-            if ($value === '') {
-                $value = null;
-            }
-            
-            $parsedHeaders[trim($name)] = $value;
+            $parsedHeaders[$header] = $value;
         }
 
         $parsedHeaders['attachments'] = explode(',', $parsedHeaders['attachments'] ?? '');
diff --git a/packages/mailer/src/x-mail.view.php b/packages/mailer/src/x-mail.view.php
@@ -1,4 +1,4 @@
-from: {{ $from }}; to: {{ $to }}; subject: {{ $subject }}; async: {{ ($async ?? true) ? 'true' : 'false' }}; attachments: {{ implode(',', $attachments ?? []) }};
+from="{{ $from }}" to="{{ $to }}" subject="{{ $subject }}" async="{{ ($async ?? true) ? 'true' : 'false' }}" attachments="{{ implode(',', $attachments ?? []) }}"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from: {{ $from }}; to: {{ $to }}; subject: {{ $subject }}; async: {{ ($async ?? true) ? 'true' : 'false' }}; attachments: {{ implode(',', $attachments ?? []) }};`
	`1`	`+from="{{ $from }}" to="{{ $to }}" subject="{{ $subject }}" async="{{ ($async ?? true) ? 'true' : 'false' }}" attachments="{{ implode(',', $attachments ?? []) }}"`
`2`	`2`	`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">`
`3`	`3`	`<html xmlns="http://www.w3.org/1999/xhtml" lang="en">`
`4`	`4`	`<head>`