From bcc4d8489387f90ce6f8439b268aac0fbd9686ae Mon Sep 17 00:00:00 2001
From: SirLouen <sir.louen@gmail.com>
Date: Fri, 26 Sep 2025 22:05:05 +0200
Subject: [PATCH 1/2] Reply-To to Indexed Array Conversion

---
 src/PHPMailer.php                         | 10 ++++---
 test/PHPMailer/ReplyToGetSetClearTest.php | 32 +++++++++--------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/PHPMailer.php b/src/PHPMailer.php
index 0596d166..a23b5568 100644
--- a/src/PHPMailer.php
+++ b/src/PHPMailer.php
@@ -1220,12 +1220,16 @@ class PHPMailer
 
                 return true;
             }
-        } elseif (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-            $this->ReplyTo[strtolower($address)] = [$address, $name];
+        } else {
+            foreach ($this->ReplyTo as $replyTo) {
+                if (0 === strcasecmp($replyTo[0], $address)) {
+                    return false;
+                }
+            }
+            $this->ReplyTo[] = [$address, $name];
 
             return true;
         }
-
         return false;
     }
 
diff --git a/test/PHPMailer/ReplyToGetSetClearTest.php b/test/PHPMailer/ReplyToGetSetClearTest.php
index 993abdd0..a1049c0e 100644
--- a/test/PHPMailer/ReplyToGetSetClearTest.php
+++ b/test/PHPMailer/ReplyToGetSetClearTest.php
@@ -48,7 +48,6 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
 
         if (isset($expected) === false) {
             $expected = [
-                'key'     => $address,
                 'address' => $address,
                 'name'    => $name,
             ];
@@ -62,25 +61,19 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
         self::assertIsArray($retrieved, 'ReplyTo property is not an array');
         self::assertCount(1, $retrieved, 'ReplyTo property does not contain exactly one address');
 
-        $key = $expected['key'];
-        self::assertArrayHasKey(
-            $key,
-            $retrieved,
-            'ReplyTo property does not contain an entry with this address as the key'
-        );
         self::assertCount(
             2,
-            $retrieved[$key],
+            $retrieved[0],
             'ReplyTo array for this address does not contain exactly two array items'
         );
         self::assertSame(
             $expected['address'],
-            $retrieved[$key][0],
+            $retrieved[0][0],
             'ReplyTo array for this address does not contain added address'
         );
         self::assertSame(
             $expected['name'],
-            $retrieved[$key][1],
+            $retrieved[0][1],
             'ReplyTo array for this address does not contain added name'
         );
     }
@@ -100,7 +93,6 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
                 'address' => " \tMiXeD@Example.Com  \r\n",
                 'name'    => null,
                 'expected' => [
-                    'key'     => 'mixed@example.com',
                     'address' => 'MiXeD@Example.Com',
                     'name'    => '',
                 ],
@@ -113,7 +105,6 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
                 'address'  => 'a@example.com',
                 'name'     => "\t\t  ReplyTo\r\nname  ",
                 'expected' => [
-                    'key'     => 'a@example.com',
                     'address' => 'a@example.com',
                     'name'    => 'ReplyToname',
                 ],
@@ -292,9 +283,11 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
 
         // Addresses with IDN are returned by get*Addresses() after preSend() call.
         $domain = $this->Mail->punyencodeAddress($domain);
+        $expected = array('test+replyto' . $domain, '');
+        $retrieved = $this->Mail->getReplyToAddresses();
         self::assertSame(
-            ['test+replyto' . $domain => ['test+replyto' . $domain, '']],
-            $this->Mail->getReplyToAddresses(),
+            $expected,
+            $retrieved[0],
             'Bad "reply-to" addresses'
         );
     }
@@ -313,6 +306,7 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
     {
         $this->Mail->CharSet = PHPMailer::CHARSET_UTF8;
 
+        xdebug_break();
         self::assertTrue(
             $this->Mail->addReplyTo('test+replyto@françois.ch', 'UTF8 domain'),
             'Initial address + name not queued'
@@ -377,24 +371,24 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
         self::assertCount(1, $retrieved, 'Stored addresses after preSend() is not 1');
 
         // Verify that the registered reply-to address is the initially added lowercase punycode one.
-        self::assertArrayHasKey(
+        self::assertSame(
             $expectedAddress,
-            $retrieved,
+            $retrieved[0][0],
             'ReplyTo property does not contain an entry with this address as the key'
         );
         self::assertCount(
             2,
-            $retrieved[$expectedAddress],
+            $retrieved[0],
             'ReplyTo array for this address does not contain exactly two array items'
         );
         self::assertSame(
             $expectedAddress,
-            $retrieved[$expectedAddress][0],
+            $retrieved[0][0],
             'ReplyTo array for this address does not contain added address'
         );
         self::assertSame(
             '',
-            $retrieved[$expectedAddress][1],
+            $retrieved[0][1],
             'ReplyTo array for this address does not contain added name'
         );
     }

From 8e8b503db947f6a5124514fee77213ed9edefd2b Mon Sep 17 00:00:00 2001
From: SirLouen <sir.louen@gmail.com>
Date: Fri, 26 Sep 2025 22:16:18 +0200
Subject: [PATCH 2/2] Doing some cleaning up

---
 test/PHPMailer/ReplyToGetSetClearTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/PHPMailer/ReplyToGetSetClearTest.php b/test/PHPMailer/ReplyToGetSetClearTest.php
index a1049c0e..e55eec47 100644
--- a/test/PHPMailer/ReplyToGetSetClearTest.php
+++ b/test/PHPMailer/ReplyToGetSetClearTest.php
@@ -306,7 +306,6 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
     {
         $this->Mail->CharSet = PHPMailer::CHARSET_UTF8;
 
-        xdebug_break();
         self::assertTrue(
             $this->Mail->addReplyTo('test+replyto@françois.ch', 'UTF8 domain'),
             'Initial address + name not queued'