[Mailer] Restore X-Transport after failure

zenas1210 · zenas1210 · commit f8294417a08f · 2022-04-24T17:54:49.000+03:00
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/TransportsTest.php b/src/Symfony/Component/Mailer/Tests/Transport/TransportsTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Mailer\Tests\Transport;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\Exception\InvalidArgumentException;
 use Symfony\Component\Mailer\Transport\TransportInterface;
@@ -64,4 +65,28 @@ public function testTransportDoesNotExist()
         $this->expectExceptionMessage('The "foobar" transport does not exist (available transports: "foo", "bar").');
         $transport->send($email);
     }
+
+    public function testTransportRestoredAfterFailure()
+    {
+        $exception = new Exception();
+
+        $fooTransport = $this->createMock(TransportInterface::class);
+        $fooTransport->method('send')
+            ->willThrowException($exception);
+
+        $transport = new Transports([
+            'foo' => $fooTransport,
+        ]);
+
+        $headers = (new Headers())->addTextHeader('X-Transport', 'foo');
+        $email = new Message($headers, new TextPart('...'));
+
+        $this->expectExceptionObject($exception);
+
+        try {
+            $transport->send($email);
+        } finally {
+            $this->assertEquals('foo', $email->getHeaders()->getHeaderBody('X-Transport'));
+        }
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/Transports.php b/src/Symfony/Component/Mailer/Transport/Transports.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\RawMessage;
+use Throwable;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -59,7 +60,13 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
             throw new InvalidArgumentException(sprintf('The "%s" transport does not exist (available transports: "%s").', $transport, implode('", "', array_keys($this->transports))));
         }
 
-        return $this->transports[$transport]->send($message, $envelope);
+        try {
+            return $this->transports[$transport]->send($message, $envelope);
+        } catch (Throwable $throwable) {
+            $headers->addTextHeader('X-Transport', $transport);
+
+            throw $throwable;
+        }
     }
 
     public function __toString(): string
