Add support for Address object in ReplyTo

Author: marickvantuil

src/Preparer.php

@@ -5,6 +5,7 @@
 namespace Stackkit\LaravelDatabaseEmails;
 
 use Carbon\Carbon;
+use Illuminate\Mail\Mailables\Address;
 
 class Preparer
 {
@@ -127,8 +128,23 @@ private function prepareBcc(EmailComposer $composer): void
      */
     private function prepareReplyTo(EmailComposer $composer): void
     {
+        $value = $composer->getData('reply_to', []);
+
+        if (! is_array($value)) {
+            $value = [$value];
+        }
+
+        foreach ($value as $i => $v) {
+            if ($v instanceof Address) {
+                $value[$i] = [
+                    'address' => $v->address,
+                    'name' => $v->name,
+                ];
+            }
+        }
+
         $composer->getEmail()->fill([
-            'reply_to' => json_encode($composer->getData('reply_to', [])),
+            'reply_to' => json_encode($value),
         ]);
     }
 

src/Validator.php

@@ -6,6 +6,8 @@
 
 use Exception;
 use Carbon\Carbon;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use const FILTER_VALIDATE_EMAIL;
 
@@ -133,7 +135,11 @@ private function validateReplyTo(EmailComposer $composer): void
             return;
         }
 
-        foreach ((array) $composer->getData('reply_to') as $replyTo) {
+        foreach (Arr::wrap($composer->getData('reply_to')) as $replyTo) {
+            if ($replyTo instanceof Address) {
+                $replyTo = $replyTo->address;
+            }
+
             if (! filter_var($replyTo, FILTER_VALIDATE_EMAIL)) {
                 throw new InvalidargumentException('E-mail address [' . $replyTo . '] is invalid');
             }

tests/SenderTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Illuminate\Mail\Mailables\Address;
 use Illuminate\Support\Facades\Event;
 use Stackkit\LaravelDatabaseEmails\MessageSent;
 use Stackkit\LaravelDatabaseEmails\SentMessage;
@@ -242,5 +243,36 @@ public function it_adds_the_reply_to_addresses()
         $this->assertCount(2, $replyTo);
         $this->assertArrayHasKey('replyto1@test.com', $replyTo);
         $this->assertArrayHasKey('replyto2@test.com', $replyTo);
+
+        if (! class_exists(Address::class)) {
+            return;
+        }
+
+        $this->sent = [];
+        $this->sendEmail([
+            'reply_to' => new Address('replyto@test.com', 'NoReplyTest'),
+        ]);
+        $this->artisan('email:send');
+        $replyTo = reset($this->sent)->replyTo;
+        $this->assertCount(1, $replyTo);
+        $this->assertSame(['replyto@test.com' => 'NoReplyTest'], $replyTo);
+
+        $this->sent = [];
+        $this->sendEmail([
+            'reply_to' => [
+                new Address('replyto@test.com', 'NoReplyTest'),
+                new Address('replyto2@test.com', 'NoReplyTest2'),
+            ],
+        ]);
+        $this->artisan('email:send');
+        $replyTo = reset($this->sent)->replyTo;
+        $this->assertCount(2, $replyTo);
+        $this->assertSame(
+            [
+                'replyto@test.com' => 'NoReplyTest',
+                'replyto2@test.com' => 'NoReplyTest2',
+            ],
+            $replyTo
+        );
     }
 }