Merge branch '4.4'

* 4.4:
  [Validator] Deprecated CacheInterface in favor of PSR-6.
  Fix wrong namespace
  [Mailer] Fix typo
  [Mailer] Fix an error message
  maintain sender/recipient name in SMTP envelopes
  [Mailer] Improve an exception when trying to send a RawMessage without an Envelope
  Fix #32148 TransportException was not thrown
  Add ErrorController to preview and render errors

Author: nicolas-grekas

DelayedSmtpEnvelope.php

@@ -45,7 +45,7 @@ public function getSender(): Address
             return parent::getSender();
         }
 
-        return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());
+        return self::getSenderFromHeaders($this->message->getHeaders());
     }
 
     public function setRecipients(array $recipients): void
@@ -73,7 +73,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array
         foreach (['to', 'cc', 'bcc'] as $name) {
             foreach ($headers->all($name) as $header) {
                 foreach ($header->getAddresses() as $address) {
-                    $recipients[] = new Address($address->getAddress());
+                    $recipients[] = $address;
                 }
             }
         }

Exception/UnsupportedHostException.php

@@ -54,7 +54,7 @@ public function __construct(Dsn $dsn)
         }
         $package = self::HOST_TO_PACKAGE_MAP[$provider] ?? null;
         if ($package && !class_exists($package['class'])) {
-            parent::__construct(sprintf('Unable to send emails via "%s" as the bridge is not installed. Try running "composer require %s".', $host, $package['package']));
+            parent::__construct(sprintf('Unable to send emails via "%s" as the bridge is not installed. Try running "composer require %s".', $provider, $package['package']));
 
             return;
         }

Mailer.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Mailer;
 
 use Symfony\Component\Mailer\Event\MessageEvent;
-use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Messenger\SendEmailMessage;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -45,15 +44,7 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): void
 
         if (null !== $this->dispatcher) {
             $message = clone $message;
-            if (null !== $envelope) {
-                $envelope = clone $envelope;
-            } else {
-                try {
-                    $envelope = new DelayedSmtpEnvelope($message);
-                } catch (\Exception $e) {
-                    throw new TransportException('Cannot send message without a valid envelope.', 0, $e);
-                }
-            }
+            $envelope = null !== $envelope ? clone $envelope : SmtpEnvelope::create($message);
             $event = new MessageEvent($message, $envelope, (string) $this->transport, true);
             $this->dispatcher->dispatch($event);
         }

SmtpEnvelope.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mailer;
 
 use Symfony\Component\Mailer\Exception\InvalidArgumentException;
+use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\RawMessage;
 
@@ -34,6 +35,10 @@ public function __construct(Address $sender, array $recipients)
 
     public static function create(RawMessage $message): self
     {
+        if (RawMessage::class === \get_class($message)) {
+            throw new LogicException('Cannot send a RawMessage instance without an explicit Envelope.');
+        }
+
         return new DelayedSmtpEnvelope($message);
     }
 

Tests/MailerTest.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\LogicException;
+use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Mailer\Transport\TransportInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Mime\RawMessage;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+
+class MailerTest extends TestCase
+{
+    public function testSendingRawMessages()
+    {
+        $this->expectException(LogicException::class);
+
+        $transport = new Mailer($this->createMock(TransportInterface::class), $this->createMock(MessageBusInterface::class), $this->createMock(EventDispatcherInterface::class));
+        $transport->send(new RawMessage('Some raw email message'));
+    }
+}

Tests/SmtpEnvelopeTest.php

@@ -12,10 +12,12 @@
 namespace Symfony\Component\Mailer\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
+use Symfony\Component\Mime\RawMessage;
 
 class SmtpEnvelopeTest extends TestCase
 {
@@ -55,19 +57,19 @@ public function testSenderFromHeaders()
         $headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('return@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('sender@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
@@ -76,17 +78,35 @@ public function testSenderFromHeadersWithoutFrom()
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
         $message->getHeaders()->addMailboxListHeader('From', [new Address('from@symfony.com', 'from')]);
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testRecipientsFromHeaders()
+    {
+        $headers = new Headers();
+        $headers->addPathHeader('Return-Path', 'return@symfony.com');
+        $headers->addMailboxListHeader('To', [new Address('to@symfony.com')]);
+        $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com')]);
+        $e = SmtpEnvelope::create(new Message($headers));
+        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+    }
+
+    public function testRecipientsFromHeadersWithNames()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', 'return@symfony.com');
         $headers->addMailboxListHeader('To', [new Address('to@symfony.com', 'to')]);
         $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com', 'cc')]);
         $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com', 'bcc')]);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+        $this->assertEquals([new Address('to@symfony.com', 'to'), new Address('cc@symfony.com', 'cc'), new Address('bcc@symfony.com', 'bcc')], $e->getRecipients());
+    }
+
+    public function testFromRawMessages()
+    {
+        $this->expectException(LogicException::class);
+
+        SmtpEnvelope::create(new RawMessage('Some raw email message'));
     }
 }

Tests/Transport/AbstractTransportTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mailer\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mime\Address;
@@ -46,4 +47,12 @@ public function testThrottling()
         $transport->send($message, $envelope);
         $this->assertEqualsWithDelta(0, time() - $start, 1);
     }
+
+    public function testSendingRawMessages()
+    {
+        $this->expectException(LogicException::class);
+
+        $transport = new NullTransport();
+        $transport->send(new RawMessage('Some raw email message'));
+    }
 }

Tests/Transport/DsnTest.php

@@ -77,12 +77,12 @@ public function invalidDsnProvider(): iterable
 
         yield [
             '//sendmail',
-            'The "//sendmail" mailer DSN must contain a transport scheme.',
+            'The "//sendmail" mailer DSN must contain a scheme.',
         ];
 
         yield [
             'file:///some/path',
-            'The "file:///some/path" mailer DSN must contain a mailer name.',
+            'The "file:///some/path" mailer DSN must contain a host (use "default" by default).',
         ];
     }
 }

Transport/AbstractTransport.php

@@ -13,9 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Symfony\Component\Mailer\DelayedSmtpEnvelope;
 use Symfony\Component\Mailer\Event\MessageEvent;
-use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\Address;
@@ -56,15 +54,7 @@ public function setMaxPerSecond(float $rate): self
     public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentMessage
     {
         $message = clone $message;
-        if (null !== $envelope) {
-            $envelope = clone $envelope;
-        } else {
-            try {
-                $envelope = new DelayedSmtpEnvelope($message);
-            } catch (\Exception $e) {
-                throw new TransportException('Cannot send message without a valid envelope.', 0, $e);
-            }
-        }
+        $envelope = null !== $envelope ? clone $envelope : SmtpEnvelope::create($message);
 
         if (null !== $this->dispatcher) {
             $event = new MessageEvent($message, $envelope, (string) $this);

Transport/Dsn.php

@@ -42,11 +42,11 @@ public static function fromString(string $dsn): self
         }
 
         if (!isset($parsedDsn['scheme'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a transport scheme.', $dsn));
+            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a scheme.', $dsn));
         }
 
         if (!isset($parsedDsn['host'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a mailer name.', $dsn));
+            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a host (use "default" by default).', $dsn));
         }
 
         $user = isset($parsedDsn['user']) ? urldecode($parsedDsn['user']) : null;