refactor: rename email builder

Author: innocenzi

packages/mailer/src/Builder/Email.php packages/mailer/src/EmailBuilder.phppackages/mailer/src/Builder/Email.php renamed to packages/mailer/src/EmailBuilder.php

@@ -1,26 +1,24 @@
 <?php
 
-namespace Tempest\Mail\Builder;
+namespace Tempest\Mail;
 
 use Stringable;
 use Tempest\Mail\Address;
-use Tempest\Mail\Attachments\Attachment;
-use Tempest\Mail\Attachments\FileAttachment;
-use Tempest\Mail\Attachments\StorageAttachment;
+use Tempest\Mail\Attachment;
 use Tempest\Mail\Content;
-use Tempest\Mail\Email as EmailInterface;
+use Tempest\Mail\Email;
 use Tempest\Mail\EmailPriority;
 use Tempest\Mail\Envelope;
 use Tempest\Mail\GenericEmail;
+use Tempest\Storage\Storage;
 use Tempest\Support\Arr;
 use Tempest\Support\Arr\ArrayInterface;
 use Tempest\View\View;
-use UnitEnum;
 
 /**
  * A builder class for creating email objects.
  */
-final class Email
+final class EmailBuilder
 {
     public function __construct(
         private(set) null|string|array|ArrayInterface|Address $to = null,
@@ -31,9 +29,9 @@ public function __construct(
         private(set) ?string $subject = null,
         private(set) null|string|View $html = null,
         private(set) ?string $text = null,
+        private(set) array $attachments = [],
         private(set) EmailPriority|int $priority = EmailPriority::NORMAL,
         private(set) array $headers = [],
-        private(set) array $attachments = [],
     ) {}
 
     /**
@@ -157,25 +155,25 @@ public function attach(Attachment ...$attachments): self
      */
     public function attachFromFileystem(string $path, ?string $name = null, ?string $contentType = null): self
     {
-        $this->attachments[] = FileAttachment::fromPath($path, $name, $contentType);
+        $this->attachments[] = Attachment::fromFilesystem($path, $name, $contentType);
 
         return $this;
     }
 
     /**
      * Adds an attachment from the storage.
      */
-    public function attachFromStorage(string $path, ?string $name = null, ?string $contentType = null, null|string|UnitEnum $tag = null): self
+    public function attachFromStorage(Storage $storage, string $path, ?string $name = null, ?string $contentType = null): self
     {
-        $this->attachments[] = StorageAttachment::fromPath($path, $name, $contentType, $tag);
+        $this->attachments[] = Attachment::fromStorage($storage, $path, $name, $contentType);
 
         return $this;
     }
 
     /**
      * Builds the email.
      */
-    public function make(): EmailInterface
+    public function make(): Email
     {
         return new GenericEmail(
             envelope: new Envelope(

packages/mailer/src/GenericEmail.php

@@ -11,4 +11,12 @@ public function __construct(
         public Envelope $envelope,
         public Content $content,
     ) {}
+
+    /**
+     * Builds a new generic email.
+     */
+    public static function build(): EmailBuilder
+    {
+        return new EmailBuilder();
+    }
 }

packages/mailer/tests/EmailBuilderTest.php

@@ -3,15 +3,21 @@
 namespace Tempest\Mail\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Tempest\Mail\Attachments\FileAttachment;
-use Tempest\Mail\Builder\Email;
-use Tempest\Mail\Email as EmailInterface;
+use Tempest\Mail\Attachment;
+use Tempest\Mail\Email;
+use Tempest\Mail\EmailBuilder;
+use Tempest\Mail\GenericEmail;
 
 final class EmailBuilderTest extends TestCase
 {
+    public function test_generic_email_builds_emails(): void
+    {
+        $this->assertInstanceOf(EmailBuilder::class, GenericEmail::build());
+    }
+
     public function test_builder(): void
     {
-        $email = new Email()
+        $email = new EmailBuilder()
             ->to('[email protected]')
             ->cc(['[email protected]', '[email protected]'])
             ->bcc('[email protected]')
@@ -20,7 +26,7 @@ public function test_builder(): void
             ->text('Gotcha!')
             ->make();
 
-        $this->assertInstanceOf(EmailInterface::class, $email);
+        $this->assertInstanceOf(Email::class, $email);
         $this->assertContains('[email protected]', $email->envelope->to);
         $this->assertContains('[email protected]', $email->envelope->cc);
         $this->assertContains('[email protected]', $email->envelope->cc);
@@ -31,7 +37,7 @@ public function test_builder(): void
 
         $attachment = $email->content->attachments[0];
 
-        $this->assertInstanceOf(FileAttachment::class, $attachment);
+        $this->assertInstanceOf(Attachment::class, $attachment);
         $this->assertSame('attachment.txt', $attachment->name);
         $this->assertSame('text/plain', $attachment->contentType);
     }