From 9c5282e2a1401f9878e41d379ca0a6cc7fbed9cf Mon Sep 17 00:00:00 2001
From: Harshit Singh <harshit.s@media.net>
Date: Mon, 2 Oct 2023 14:41:26 +0530
Subject: [PATCH] Review fix

---
 src/PHPMailer.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PHPMailer.php b/src/PHPMailer.php
index 96e5e96d..5109ef68 100644
--- a/src/PHPMailer.php
+++ b/src/PHPMailer.php
@@ -1571,7 +1571,10 @@ class PHPMailer
 
             //Validate From, Sender, and ConfirmReadingTo addresses
             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
-                $this->{$address_kind} = trim($this->{$address_kind} ?? '');
+                if($this->{$address_kind} === null) {
+                    $this->{$address_kind} = '';
+                }
+                $this->{$address_kind} = trim($this->{$address_kind});
                 if (empty($this->{$address_kind})) {
                     continue;
                 }