symfony · nicolas-grekas · Mar 12, 2024 · Mar 11, 2024
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Fixtures/fake-failing-sendmail.php b/src/Symfony/Component/Mailer/Tests/Transport/Fixtures/fake-failing-sendmail.php
@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+print "Sending failed";
+exit(42);
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportTest.php
@@ -13,13 +13,15 @@

 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\DelayedEnvelope;
+use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Transport\SendmailTransport;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;

 class SendmailTransportTest extends TestCase
 {
    private const FAKE_SENDMAIL = __DIR__.'/Fixtures/fake-sendmail.php -t';
+    private const FAKE_FAILING_SENDMAIL = __DIR__.'/Fixtures/fake-failing-sendmail.php -t';

    /**
     * @var string
@@ -89,4 +91,27 @@ public function testRecipientsAreUsedWhenSet()

        $this->assertStringEqualsFile($this->argsPath, __DIR__.'/Fixtures/fake-sendmail.php -ffrom@mail.com recipient@mail.com');
    }
+
+    public function testThrowsTransportExceptionOnFailure()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Windows does not support shebangs nor non-blocking standard streams');
+        }
+
+        $mail = new Email();
+        $mail
+            ->from('from@mail.com')
+            ->to('to@mail.com')
+            ->subject('Subject')
+            ->text('Some text')
+        ;
+
+        $envelope = new DelayedEnvelope($mail);
+        $envelope->setRecipients([new Address('recipient@mail.com')]);
+
+        $sendmailTransport = new SendmailTransport(self::FAKE_FAILING_SENDMAIL);
+        $this->expectException(TransportException::class);
+        $this->expectExceptionMessage('Process failed with exit code 42: Sending failed');
+        $sendmailTransport->send($mail, $envelope);
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php
@@ -27,6 +27,7 @@ abstract class AbstractStream
    protected $stream;
    protected $in;
    protected $out;
+    protected $err;

    private $debug = '';

@@ -65,7 +66,7 @@ abstract public function initialize(): void;

    public function terminate(): void
    {
-        $this->stream = $this->out = $this->in = null;
+        $this->stream = $this->err = $this->out = $this->in = null;
    }

    public function readLine(): string

diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -45,14 +45,20 @@ public function initialize(): void
        }
        $this->in = &$pipes[0];
        $this->out = &$pipes[1];
+        $this->err = &$pipes[2];
    }

    public function terminate(): void
    {
        if (null !== $this->stream) {
            fclose($this->in);
+            $out = stream_get_contents($this->out);
            fclose($this->out);
-            proc_close($this->stream);
+            $err = stream_get_contents($this->err);
+            fclose($this->err);
+            if (0 !== $exitCode = proc_close($this->stream)) {
+                throw new TransportException('Process failed with exit code '.$exitCode.': '.$out.$err);
+            }
        }

        parent::terminate();