Do not throw transport exception when in interactive mode

bobvandevijver · bobvandevijver · commit e13f7c7c90f0 · 2024-04-11T15:39:59.000+02:00
diff --git a/src/Symfony/Component/Mailer/Transport/SendmailTransport.php b/src/Symfony/Component/Mailer/Transport/SendmailTransport.php
@@ -64,6 +64,7 @@ public function __construct(?string $command = null, ?EventDispatcherInterface $
         $this->stream = new ProcessStream();
         if (str_contains($this->command, ' -bs')) {
             $this->stream->setCommand($this->command);
+            $this->stream->setInteractive(true);
             $this->transport = new SmtpTransport($this->stream, $dispatcher, $logger);
         }
     }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -25,11 +25,18 @@ final class ProcessStream extends AbstractStream
 {
     private $command;
 
+    private $interactive = false;
+
     public function setCommand(string $command)
     {
         $this->command = $command;
     }
 
+    public function setInteractive(bool $interactive)
+    {
+        $this->interactive = $interactive;
+    }
+
     public function initialize(): void
     {
         $descriptorSpec = [
@@ -63,7 +70,7 @@ public function terminate(): void
 
         parent::terminate();
 
-        if (isset($errorMessage)) {
+        if (!$this->interactive && isset($errorMessage)) {
             throw new TransportException($errorMessage);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public function __construct(?string $command = null, ?EventDispatcherInterface $`
`64`	`64`	`$this->stream = new ProcessStream();`
`65`	`65`	`if (str_contains($this->command, ' -bs')) {`
`66`	`66`	`$this->stream->setCommand($this->command);`
	`67`	`+ $this->stream->setInteractive(true);`
`67`	`68`	`$this->transport = new SmtpTransport($this->stream, $dispatcher, $logger);`
`68`	`69`	`}`
`69`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,18 @@ final class ProcessStream extends AbstractStream`
`25`	`25`	`{`
`26`	`26`	`private $command;`
`27`	`27`
	`28`	`+ private $interactive = false;`
	`29`	`+`
`28`	`30`	`public function setCommand(string $command)`
`29`	`31`	`{`
`30`	`32`	`$this->command = $command;`
`31`	`33`	`}`
`32`	`34`
	`35`	`+ public function setInteractive(bool $interactive)`
	`36`	`+ {`
	`37`	`+ $this->interactive = $interactive;`
	`38`	`+ }`
	`39`	`+`
`33`	`40`	`public function initialize(): void`
`34`	`41`	`{`
`35`	`42`	`$descriptorSpec = [`
`@@ -63,7 +70,7 @@ public function terminate(): void`
`63`	`70`
`64`	`71`	`parent::terminate();`
`65`	`72`
`66`		`- if (isset($errorMessage)) {`
	`73`	`+ if (!$this->interactive && isset($errorMessage)) {`
`67`	`74`	`throw new TransportException($errorMessage);`
`68`	`75`	`}`
`69`	`76`	`}`