[Mailer] Fix error message in case of an STMP error

fabpot · fabpot · commit 447a9e315339 · 2022-08-01T14:50:42.000+02:00
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -120,7 +120,13 @@ protected function doHeloCommand(): void
                 $response = $this->executeCommand(sprintf("EHLO %s\r\n", $this->getLocalDomain()), [250]);
                 $capabilities = $this->getCapabilities($response);
             } catch (TransportExceptionInterface $e) {
-                parent::doHeloCommand();
+                try {
+                    parent::doHeloCommand();
+                } catch (TransportExceptionInterface $ex) {
+                    if (!$ex->getCode()) {
+                        throw $e;
+                    }
+                }
 
                 return;
             }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
@@ -176,6 +176,7 @@ public function __toString(): string
     public function executeCommand(string $command, array $codes): string
     {
         $this->stream->write($command);
+
         $response = $this->getFullResponse();
         $this->assertResponseCode($response, $codes);
 
@@ -295,15 +296,11 @@ private function assertResponseCode(string $response, array $codes): void
             throw new LogicException('You must set the expected response code.');
         }
 
-        if (!$response) {
-            throw new TransportException(sprintf('Expected response code "%s" but got an empty response.', implode('/', $codes)));
-        }
-
         [$code] = sscanf($response, '%3d');
         $valid = \in_array($code, $codes);
-
         if (!$valid) {
-            throw new TransportException(sprintf('Expected response code "%s" but got code "%s", with message "%s".', implode('/', $codes), $code, trim($response)), $code);
+            $extra = $response ? sprintf(', with message "%s"', trim($response)) : '';
+            throw new TransportException(sprintf('Expected response code "%s" but got code "%s"%s.', implode('/', $codes), $code, $extra), $code);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ public function __toString(): string`
`176`	`176`	`public function executeCommand(string $command, array $codes): string`
`177`	`177`	`{`
`178`	`178`	`$this->stream->write($command);`
	`179`	`+`
`179`	`180`	`$response = $this->getFullResponse();`
`180`	`181`	`$this->assertResponseCode($response, $codes);`
`181`	`182`
`@@ -295,15 +296,11 @@ private function assertResponseCode(string $response, array $codes): void`
`295`	`296`	`throw new LogicException('You must set the expected response code.');`
`296`	`297`	`}`
`297`	`298`
`298`		`- if (!$response) {`
`299`		`- throw new TransportException(sprintf('Expected response code "%s" but got an empty response.', implode('/', $codes)));`
`300`		`- }`
`301`		`-`
`302`	`299`	`[$code] = sscanf($response, '%3d');`
`303`	`300`	`$valid = \in_array($code, $codes);`
`304`		`-`
`305`	`301`	`if (!$valid) {`
`306`		`- throw new TransportException(sprintf('Expected response code "%s" but got code "%s", with message "%s".', implode('/', $codes), $code, trim($response)), $code);`
	`302`	`+ $extra = $response ? sprintf(', with message "%s"', trim($response)) : '';`
	`303`	`+ throw new TransportException(sprintf('Expected response code "%s" but got code "%s"%s.', implode('/', $codes), $code, $extra), $code);`
`307`	`304`	`}`
`308`	`305`	`}`
`309`	`306`