allow sub-classes to change the way the message id parsed

xabbuh · xabbuh · commit 622cd018cdd7 · 2022-07-29T11:43:28.000+02:00
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'];
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa`
`147`	`147`	`throw $e;`
`148`	`148`	`}`
`149`	`149`
`150`		`- if ($this->mtaResult && $messageId = $this->parseMessageId()) {`
	`150`	`+ if ($this->mtaResult && $messageId = $this->parseMessageId($this->mtaResult)) {`
`151`	`151`	`$message->setMessageId($messageId);`
`152`	`152`	`}`
`153`	`153`
`@@ -156,15 +156,15 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa`
`156`	`156`	`return $message;`
`157`	`157`	`}`
`158`	`158`
`159`		`- protected function parseMessageId(): string`
	`159`	`+ protected function parseMessageId(string $mtaResult): string`
`160`	`160`	`{`
`161`	`161`	`$regexps = [`
`162`	`162`	`'/250 Ok (?P<id>[0-9a-f-]+)\r?$/mis',`
`163`		`- '/250 Ok:? queued as (?P<id>[A-Z0-9]+)\r?$/mis'`
	`163`	`+ '/250 Ok:? queued as (?P<id>[A-Z0-9]+)\r?$/mis',`
`164`	`164`	`];`
`165`	`165`	`$matches = [];`
`166`	`166`	`foreach ($regexps as $regexp) {`
`167`		`- if (preg_match($regexp, $this->mtaResult, $matches)) {`
	`167`	`+ if (preg_match($regexp, $mtaResult, $matches)) {`
`168`	`168`	`return $matches['id'];`
`169`	`169`	`}`
`170`	`170`	`}`