minor #47108 [Mailer] allow sub-classes to change the way the message id parsed (xabbuh)

xabbuh · xabbuh · commit 905bc205d166 · 2022-07-29T11:47:51.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Mailer] allow sub-classes to change the way the message id parsed | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 622cd01 allow sub-classes to change the way the message id parsed
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
@@ -147,7 +147,7 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
             throw $e;
         }
 
-        if ($this->mtaResult && $messageId = $this->parseMessageId()) {
+        if ($this->mtaResult && $messageId = $this->parseMessageId($this->mtaResult)) {
             $message->setMessageId($messageId);
         }
 
@@ -156,15 +156,15 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
         return $message;
     }
 
-    protected function parseMessageId(): string
+    protected function parseMessageId(string $mtaResult): string
     {
         $regexps = [
             '/250 Ok (?P<id>[0-9a-f-]+)\r?$/mis',
-            '/250 Ok:? queued as (?P<id>[A-Z0-9]+)\r?$/mis'
+            '/250 Ok:? queued as (?P<id>[A-Z0-9]+)\r?$/mis',
         ];
         $matches = [];
         foreach ($regexps as $regexp) {
-            if (preg_match($regexp, $this->mtaResult, $matches)) {
+            if (preg_match($regexp, $mtaResult, $matches)) {
                 return $matches['id'];
             }
         }
