wip

Author: brendt

packages/mailer/src/EmailToSymfonyEmailMapper.php

@@ -10,7 +10,6 @@
 use Tempest\Mail\Exceptions\SenderWasMissing;
 use Tempest\Mail\Transports\ProvidesDefaultSender;
 use Tempest\Mapper\Mapper;
-use Tempest\Support\Arr;
 use Tempest\View\View;
 use Tempest\View\ViewRenderer;
 

packages/mailer/src/GenericMailer.php

@@ -4,51 +4,27 @@
 
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Tempest\EventBus\EventBus;
-use Tempest\Mail\Exceptions\MailerTransportWasMissing;
-use Tempest\View\ViewRenderer;
 
 use function Tempest\map;
 
 /**
  * Generic mailer based on Symfony transports.
  */
-final class GenericMailer implements Mailer
+final readonly class GenericMailer implements Mailer
 {
     public function __construct(
-        private readonly MailerConfig $mailerConfig,
-        private readonly ViewRenderer $viewRenderer,
-        private readonly ?EventBus $eventBus = null,
-        private ?TransportInterface $transport = null,
-    ) {
-        $this->transport ??= $this->createTransport();
-    }
+        private EventBus $eventBus,
+        private TransportInterface $transport,
+    ) {}
 
-    public function send(Email $email): SentEmail
+    public function send(Email $email): void
     {
-        $symfonyEmail = map($email)
-            ->with(fn (Email $from) => new EmailToSymfonyEmailMapper($this->mailerConfig, $this->viewRenderer)->map($from, null))
+        $symfonyMail = map($email)
+            ->with(EmailToSymfonyEmailMapper::class)
             ->do();
 
-        $this->eventBus?->dispatch(new EmailWasSent($email));
-
-        return new SentGenericEmail(
-            original: $email,
-            symfonyEmail: $symfonyEmail,
-            sent: $this->transport->send($symfonyEmail),
-        );
-    }
-
-    private function createTransport(): TransportInterface
-    {
-        $this->assertTransportInstalled($this->mailerConfig->transport);
-
-        return $this->mailerConfig->createTransport();
-    }
+        $this->transport->send($symfonyMail);
 
-    private function assertTransportInstalled(string $transport): void
-    {
-        if (! class_exists($transport)) {
-            throw new MailerTransportWasMissing($transport);
-        }
+        $this->eventBus?->dispatch(new EmailWasSent($email));
     }
 }

packages/mailer/src/Mailer.php

@@ -10,5 +10,5 @@ interface Mailer
     /**
      * Sends the given email.
      */
-    public function send(Email $email): SentEmail;
+    public function send(Email $email): void;
 }

packages/mailer/src/MailerInitializer.php

@@ -6,6 +6,7 @@
 use Tempest\Container\Initializer;
 use Tempest\Container\Singleton;
 use Tempest\EventBus\EventBus;
+use Tempest\Mail\Exceptions\MailerTransportWasMissing;
 use Tempest\Mail\MailerConfig;
 use Tempest\View\ViewRenderer;
 
@@ -15,9 +16,8 @@ final class MailerInitializer implements Initializer
     public function initialize(Container $container): Mailer
     {
         return new GenericMailer(
-            mailerConfig: $container->get(MailerConfig::class),
-            viewRenderer: $container->get(ViewRenderer::class),
             eventBus: $container->get(EventBus::class),
+            transport: $container->get(MailerConfig::class)->createTransport(),
         );
     }
 }

packages/mailer/src/SentEmail.php

@@ -3,13 +3,12 @@
 namespace Tempest\Mail\Testing;
 
 use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\Mime\Part\DataPart;
 
-final class TestingAttachment
+final class AttachmentTester
 {
     /**
-     * Headers associated to this attachment.
+     * Headers associated with this attachment.
      */
     public array $headers {
         get => $this->original->getHeaders()->toArray();
@@ -32,24 +31,40 @@ final class TestingAttachment
     /**
      * Type of this attachment.
      */
-    public string $type {
+    public string $mediaType {
         get => $this->original->getMediaType();
     }
 
     public function __construct(
         private DataPart $original,
     ) {}
 
+    /**
+     * Asserts that the content of the attachment matches
+     */
+    public function assertContent(string $expected): self
+    {
+        Assert::assertSame(
+            expected: $expected,
+            actual: $this->body,
+            message: "Failed asserting that attachment content is `{$expected}`. Actual content is `{$this->body}`",
+        );
+
+        return $this;
+    }
+
     /**
      * Asserts that the attachment has the given name.
      */
-    public function assertNamed(string $name): void
+    public function assertNamed(string $name): self
     {
         Assert::assertSame(
             expected: $name,
             actual: $this->name,
             message: "Failed asserting that attachment name is `{$name}`. Actual name is `{$this->name}`",
         );
+
+        return $this;
     }
 
     /**
@@ -67,24 +82,28 @@ public function assertNotNamed(string $name): void
     /**
      * Asserts that the attachment has the given type.
      */
-    public function assertType(string $type): void
+    public function assertType(string $type): self
     {
         Assert::assertSame(
             expected: $type,
-            actual: $this->type,
-            message: "Failed asserting that attachment type is `{$type}`. Actual type is `{$this->type}`",
+            actual: $this->mediaType,
+            message: "Failed asserting that attachment type is `{$type}`. Actual type is `{$this->mediaType}`",
         );
+
+        return $this;
     }
 
     /**
      * Asserts that the attachment does not have the given type.
      */
-    public function assertNotType(string $type): void
+    public function assertNotType(string $type): self
     {
         Assert::assertNotSame(
             expected: $type,
-            actual: $this->type,
+            actual: $this->mediaType,
             message: "Failed asserting that attachment type is not `{$type}`.",
         );
+
+        return $this;
     }
 }