minor #43238 [Mailer] Improve error message when STARTTLS fails (nicolas-grekas)

fabpot · fabpot · commit 498284e0765d · 2021-09-28T19:35:07.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Mailer] Improve error message when STARTTLS fails | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 9f7c485 [Mailer] Improve error message when STARTTLS fails
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php
@@ -167,7 +167,14 @@ public function initialize(): void
 
     public function startTLS(): bool
     {
-        return (bool) stream_socket_enable_crypto($this->stream, true);
+        set_error_handler(function ($type, $msg) {
+            throw new TransportException('Unable to connect with STARTTLS: '.$msg);
+        });
+        try {
+            return stream_socket_enable_crypto($this->stream, true);
+        } finally {
+            restore_error_handler();
+        }
     }
 
     public function terminate(): void

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,14 @@ public function initialize(): void`
`167`	`167`
`168`	`168`	`public function startTLS(): bool`
`169`	`169`	`{`
`170`		`- return (bool) stream_socket_enable_crypto($this->stream, true);`
	`170`	`+ set_error_handler(function ($type, $msg) {`
	`171`	`+ throw new TransportException('Unable to connect with STARTTLS: '.$msg);`
	`172`	`+ });`
	`173`	`+ try {`
	`174`	`+ return stream_socket_enable_crypto($this->stream, true);`
	`175`	`+ } finally {`
	`176`	`+ restore_error_handler();`
	`177`	`+ }`
`171`	`178`	`}`
`172`	`179`
`173`	`180`	`public function terminate(): void`