fix(mailer): small tweaks and bugfixes (#1408)

brendt · web-flow · commit f80536a5ba57 · 2025-07-17T08:36:46.000+02:00
diff --git a/packages/mail/src/EmailAddress.php b/packages/mail/src/EmailAddress.php
@@ -4,7 +4,7 @@
 
 use Stringable;
 
-final readonly class Address implements Stringable
+final readonly class EmailAddress implements Stringable
 {
     public function __construct(
         public string $email,
diff --git a/packages/mail/src/EmailToSymfonyEmailMapper.php b/packages/mail/src/EmailToSymfonyEmailMapper.php
@@ -43,7 +43,7 @@ public function map(mixed $from, mixed $to): SymfonyEmail
         }
 
         if ($this->mailerConfig instanceof ProvidesDefaultSender && $this->mailerConfig->defaultSender) {
-            $symfonyEmail->from($this->mailerConfig->defaultSender);
+            $symfonyEmail->from(...$this->convertAddresses($this->mailerConfig->defaultSender));
         }
 
         if ($email->envelope->from) {
@@ -83,7 +83,7 @@ public function map(mixed $from, mixed $to): SymfonyEmail
         // Set HTML content
         $html = match (true) {
             $email->html instanceof View => $this->viewRenderer->render($email->html),
-            str_ends_with($email->html, '.view.html') => $this->viewRenderer->render($email->html),
+            str_ends_with($email->html, '.view.php') => $this->viewRenderer->render($email->html),
             default => $email->html,
         };
 
@@ -95,7 +95,7 @@ public function map(mixed $from, mixed $to): SymfonyEmail
         if ($email instanceof HasTextContent) {
             $text = match (true) {
                 $email->text instanceof View => $this->viewRenderer->render($email->text),
-                str_ends_with($email->text ?? '', '.view.html') => $this->viewRenderer->render($email->text),
+                str_ends_with($email->text ?? '', '.view.php') => $this->viewRenderer->render($email->text),
                 default => $email->text,
             };
         }
@@ -116,12 +116,12 @@ public function map(mixed $from, mixed $to): SymfonyEmail
         return $symfonyEmail;
     }
 
-    private function convertAddresses(null|string|array|Address $addresses): array
+    private function convertAddresses(null|string|array|EmailAddress $addresses): array
     {
         return arr($addresses)
-            ->map(fn (string|Address|SymfonyAddress $address) => match (true) {
+            ->map(fn (string|EmailAddress|SymfonyAddress $address) => match (true) {
                 $address instanceof SymfonyAddress => $address,
-                $address instanceof Address => new SymfonyAddress($address->email, $address->name),
+                $address instanceof EmailAddress => new SymfonyAddress($address->email, $address->name ?? ''),
                 is_string($address) => SymfonyAddress::create($address),
                 default => null,
             })
diff --git a/packages/mail/src/Envelope.php b/packages/mail/src/Envelope.php
@@ -9,11 +9,11 @@ final class Envelope
 {
     public function __construct(
         public ?string $subject,
-        public null|string|array|Address $to,
-        public null|string|array|Address $from = null,
-        public null|string|array|Address $cc = null,
-        public null|string|array|Address $bcc = null,
-        public null|string|array|Address $replyTo = null,
+        public null|string|array|EmailAddress $to,
+        public null|string|array|EmailAddress $from = null,
+        public null|string|array|EmailAddress $cc = null,
+        public null|string|array|EmailAddress $bcc = null,
+        public null|string|array|EmailAddress $replyTo = null,
         public array $headers = [],
         public EmailPriority $priority = EmailPriority::NORMAL,
     ) {}
diff --git a/packages/mail/src/GenericEmail.php b/packages/mail/src/GenericEmail.php
@@ -21,13 +21,13 @@ final class GenericEmail implements Email, HasTextContent, HasAttachments
 
     public function __construct(
         public ?string $subject,
-        public null|string|array|Address $to,
+        public null|string|array|EmailAddress $to,
         public string|View $html,
         public string|View|null $text = null,
-        public null|string|array|Address $from = null,
-        public null|string|array|Address $cc = null,
-        public null|string|array|Address $bcc = null,
-        public null|string|array|Address $replyTo = null,
+        public null|string|array|EmailAddress $from = null,
+        public null|string|array|EmailAddress $cc = null,
+        public null|string|array|EmailAddress $bcc = null,
+        public null|string|array|EmailAddress $replyTo = null,
         public array $headers = [],
         public EmailPriority $priority = EmailPriority::NORMAL,
         public array $attachments = [],
diff --git a/packages/mail/src/Testing/MailTester.php b/packages/mail/src/Testing/MailTester.php
@@ -9,9 +9,9 @@
 use Symfony\Component\Mime\Address as SymfonyAddress;
 use Symfony\Component\Mime\Email as SymfonyEmail;
 use Symfony\Component\Mime\Part\DataPart;
-use Tempest\Mail\Address;
 use Tempest\Mail\Attachment;
 use Tempest\Mail\Email;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\EmailPriority;
 use Tempest\Mail\EmailToSymfonyEmailMapper;
 use Tempest\Support\Arr;
@@ -94,14 +94,14 @@ public function assertNotSent(string $email): self
     public array $from {
         get => Arr\map_iterable(
             array: $this->sentSymfonyEmail->getFrom(),
-            map: fn (SymfonyAddress $address) => new Address($address->getAddress(), $address->getName()),
+            map: fn (SymfonyAddress $address) => new EmailAddress($address->getAddress(), $address->getName()),
         );
     }
 
     public array $to {
         get => Arr\map_iterable(
             array: $this->sentSymfonyEmail->getTo(),
-            map: fn (SymfonyAddress $address) => new Address($address->getAddress(), $address->getName()),
+            map: fn (SymfonyAddress $address) => new EmailAddress($address->getAddress(), $address->getName()),
         );
     }
 
@@ -413,7 +413,7 @@ public function assertHasHeader(string $header, ?string $value = null): self
         return $this;
     }
 
-    private function assertAddressListContains(null|string|array|Address $haystack, string|array $needles, string $message): self
+    private function assertAddressListContains(null|string|array|EmailAddress $haystack, string|array $needles, string $message): self
     {
         $needles = Arr\wrap($needles);
         $haystack = $this->convertAddresses($haystack);
@@ -429,7 +429,7 @@ private function assertAddressListContains(null|string|array|Address $haystack,
         return $this;
     }
 
-    private function assertAddressListDoesNotContain(null|string|array|Address $haystack, string|array $needles, string $message): self
+    private function assertAddressListDoesNotContain(null|string|array|EmailAddress $haystack, string|array $needles, string $message): self
     {
         $needles = Arr\wrap($needles);
         $haystack = $this->convertAddresses($haystack);
@@ -445,13 +445,13 @@ private function assertAddressListDoesNotContain(null|string|array|Address $hays
         return $this;
     }
 
-    private function convertAddresses(null|string|array|Address $addresses): array
+    private function convertAddresses(null|string|array|EmailAddress $addresses): array
     {
         return arr($addresses)
-            ->map(function (string|Address|SymfonyAddress $address) {
+            ->map(function (string|EmailAddress|SymfonyAddress $address) {
                 return match (true) {
                     $address instanceof SymfonyAddress => $address->getAddress(),
-                    $address instanceof Address => $address->email,
+                    $address instanceof EmailAddress => $address->email,
                     is_string($address) => $address,
                     default => null,
                 };
diff --git a/packages/mail/src/Transports/NullMailerConfig.php b/packages/mail/src/Transports/NullMailerConfig.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\MailerConfig;
 
 /**
@@ -15,7 +15,7 @@ final class NullMailerConfig implements MailerConfig, ProvidesDefaultSender
     public string $transport = NullTransport::class;
 
     public function __construct(
-        public null|string|Address $defaultSender = null,
+        public null|string|EmailAddress $defaultSender = null,
     ) {}
 
     public function createTransport(): TransportInterface
diff --git a/packages/mail/src/Transports/Postmark/PostmarkConfig.php b/packages/mail/src/Transports/Postmark/PostmarkConfig.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\TransportInterface;
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\MailerConfig;
 use Tempest\Mail\Transports\ProvidesDefaultSender;
 
@@ -42,7 +42,7 @@ public function __construct(
         /**
          * Address from which emails are sent by default.
          */
-        public null|string|Address $defaultSender = null,
+        public null|string|EmailAddress $defaultSender = null,
 
         /**
          * Whether to use Postmark's API or SMTP server.
diff --git a/packages/mail/src/Transports/ProvidesDefaultSender.php b/packages/mail/src/Transports/ProvidesDefaultSender.php
@@ -2,14 +2,14 @@
 
 namespace Tempest\Mail\Transports;
 
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 
 interface ProvidesDefaultSender
 {
     /**
      * The default address from which emails will be sent.
      */
-    public null|string|Address $defaultSender {
+    public null|string|EmailAddress $defaultSender {
         get;
     }
 }
diff --git a/packages/mail/src/Transports/RoundRobinMailerConfig.php b/packages/mail/src/Transports/RoundRobinMailerConfig.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Mailer\Transport\RoundRobinTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Tempest\DateTime\Duration;
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\MailerConfig;
 use Tempest\Support\Arr;
 use UnitEnum;
diff --git a/packages/mail/src/Transports/Ses/SesMailerConfig.php b/packages/mail/src/Transports/Ses/SesMailerConfig.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\TransportInterface;
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\MailerConfig;
 use Tempest\Mail\Transports\ProvidesDefaultSender;
 
@@ -52,7 +52,7 @@ public function __construct(
         /**
          * Address from which emails are sent by default.
          */
-        public null|string|Address $defaultSender = null,
+        public null|string|EmailAddress $defaultSender = null,
 
         /**
          * Whether to use Amazon SES's API or async HTTP transport.
diff --git a/packages/mail/src/Transports/Ses/SesSmtpMailerConfig.php b/packages/mail/src/Transports/Ses/SesSmtpMailerConfig.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\MailerConfig;
 use UnitEnum;
 
@@ -49,7 +49,7 @@ public function __construct(
         /**
          * Address from which emails are sent by default.
          */
-        public null|string|Address $from = null,
+        public null|string|EmailAddress $from = null,
 
         /**
          * Whether to use Amazon SES's API or SMTP server.
diff --git a/packages/mail/src/Transports/Smtp/SmtpMailerConfig.php b/packages/mail/src/Transports/Smtp/SmtpMailerConfig.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory;
 use Symfony\Component\Mailer\Transport\Smtp\SmtpTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
-use Tempest\Mail\Address;
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\MailerConfig;
 use Tempest\Mail\Transports\ProvidesDefaultSender;
 
@@ -46,7 +46,7 @@ public function __construct(
         /**
          * The default address from which emails will be sent.
          */
-        public null|string|Address $defaultSender = null,
+        public null|string|EmailAddress $defaultSender = null,
 
         /**
          * Whether to use TLS for this connection.
diff --git a/packages/mail/src/mail.config.php b/packages/mail/src/mail.config.php
@@ -1,15 +1,28 @@
 <?php
 
+use Tempest\Mail\EmailAddress;
 use Tempest\Mail\Transports\Smtp\SmtpMailerConfig;
 use Tempest\Mail\Transports\Smtp\SmtpScheme;
 
+use function Tempest\env;
+
+$defaultSender = null;
+
+if (env('MAIL_SENDER_NAME') && env('MAIL_SENDER_EMAIL')) {
+    $defaultSender = new EmailAddress(
+        email: env('MAIL_SENDER_EMAIL'),
+        name: env('MAIL_SENDER_NAME'),
+    );
+}
+
 return new SmtpMailerConfig(
-    scheme: match (strtolower(env('MAILER_SMTP_SCHEME', default: 'smtp'))) {
+    scheme: match (strtolower(env('MAIL_SMTP_SCHEME', default: 'smtp'))) {
         'smtps' => SmtpScheme::SMTPS,
         'smtp' => SmtpScheme::SMTP,
     },
-    host: env('MAILER_SMTP_HOST', default: '127.0.0.0'),
-    port: env('MAILER_SMTP_PORT', default: 2525),
-    username: env('MAILER_SMTP_USERNAME', default: ''),
-    password: env('MAILER_SMTP_PASSWORD', default: ''),
+    host: env('MAIL_SMTP_HOST', default: '127.0.0.0'),
+    port: env('MAIL_SMTP_PORT', default: 2525),
+    username: env('MAIL_SMTP_USERNAME', default: ''),
+    password: env('MAIL_SMTP_PASSWORD', default: ''),
+    defaultSender: $defaultSender,
 );
diff --git a/src/Tempest/Framework/Testing/IntegrationTest.php b/src/Tempest/Framework/Testing/IntegrationTest.php
@@ -56,7 +56,7 @@ abstract class IntegrationTest extends TestCase
 
     protected StorageTester $storage;
 
-    protected MailTester $mail;
+    protected MailTester $mailer;
 
     protected CacheTester $cache;
 
@@ -84,7 +84,7 @@ protected function setUp(): void
         $this->eventBus = new EventBusTester($this->container);
         $this->storage = new StorageTester($this->container);
         $this->cache = new CacheTester($this->container);
-        $this->mail = new MailTester(new TestingMailer(
+        $this->mailer = new MailTester(new TestingMailer(
             eventBus: $this->container->get(EventBus::class),
         ));
 
diff --git a/tests/Integration/Mailer/Fixtures/email.view.php b/tests/Integration/Mailer/Fixtures/email.view.php
@@ -0,0 +1 @@
+Hi
diff --git a/tests/Integration/Mailer/MailerTest.php b/tests/Integration/Mailer/MailerTest.php
@@ -17,7 +17,7 @@ public function test_event(): void
     {
         $this->eventBus->preventEventHandling();
 
-        $this->mail->send(new GenericEmail(
+        $this->mailer->send(new GenericEmail(
             subject: 'Hello',
             to: 'jon@doe.co',
             html: 'Hello Jon',
@@ -33,7 +33,7 @@ public function test_default_sender(): void
             defaultSender: 'brent@tempestphp.com',
         ));
 
-        $sent = $this->mail->send(new GenericEmail(
+        $sent = $this->mailer->send(new GenericEmail(
             subject: 'Hello',
             to: 'jon@doe.co',
             html: 'Hello Jon',
@@ -46,7 +46,7 @@ public function test_sending_mail_requires_from(): void
     {
         $this->expectException(SenderWasMissing::class);
 
-        $this->mail->send(new GenericEmail(
+        $this->mailer->send(new GenericEmail(
             subject: 'Hello',
             to: 'jon@doe.co',
             html: 'Hello Jon',
@@ -57,7 +57,7 @@ public function test_sending_mail_requires_to(): void
     {
         $this->expectException(RecipientWasMissing::class);
 
-        $this->mail->send(new GenericEmail(
+        $this->mailer->send(new GenericEmail(
             subject: 'Hello',
             to: '',
             html: 'Hello Jon',
@@ -70,7 +70,7 @@ public function test_send_attachment_with_interface(): void
         $storage = $this->storage->fake();
         $storage->write('attachment.txt', 'owo');
 
-        $this->mail
+        $this->mailer
             ->send(
                 new AttachmentEmail(
                     attachments: [
@@ -88,7 +88,7 @@ public function test_send_attachment(): void
         $storage = $this->storage->fake();
         $storage->write('attachment.txt', 'owo');
 
-        $this->mail
+        $this->mailer
             ->send(new GenericEmail(
                 subject: 'Hello',
                 to: 'jon@doe.co',
diff --git a/tests/Integration/Mailer/MailerTesterTest.php b/tests/Integration/Mailer/MailerTesterTest.php
diff --git a/tests/Integration/Mailer/SentEmailTest.php b/tests/Integration/Mailer/SentEmailTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Stringable;`
`6`	`6`
`7`		`-final readonly class Address implements Stringable`
	`7`	`+final readonly class EmailAddress implements Stringable`
`8`	`8`	`{`
`9`	`9`	`public function __construct(`
`10`	`10`	`public string $email,`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace Tempest\Mail\Transports;`
`4`	`4`
`5`		`-use Tempest\Mail\Address;`
	`5`	`+use Tempest\Mail\EmailAddress;`
`6`	`6`
`7`	`7`	`interface ProvidesDefaultSender`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* The default address from which emails will be sent.`
`11`	`11`	`*/`
`12`		`- public null\|string\|Address $defaultSender {`
	`12`	`+ public null\|string\|EmailAddress $defaultSender {`
`13`	`13`	`get;`
`14`	`14`	`}`
`15`	`15`	`}`