Merge branch '4.4'

* 4.4:
  Minor fixes
  [Mailer] fixed dispatcher not available in Mailer
  [HttpClient] Minor fixes
  Use namespaced Phpunit classes
  Add polyfill for PhpUnit namespace
  [Messenger] Fixed ConsumeMessagesCommand configuration
  [Form] remove leftover int child phpdoc
  Support DateTimeInterface in IntlDateFormatter::format
  [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke
  [Yaml] Removed unused $nullAsTilde property
  [Security] add support for opportunistic password migrations
  [Lock] Legacy test should implement legacy interface
  fixed phpdocs
  Use PHPunit assertion
  [Intl] Order alpha2 to alpha3 mapping + phpdoc fixes

Author: nicolas-grekas

Mailer.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Mime\RawMessage;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @author Fabien Potencier <[email protected]>
@@ -25,8 +26,9 @@ class Mailer implements MailerInterface
 {
     private $transport;
     private $bus;
+    private $dispatcher;
 
-    public function __construct(TransportInterface $transport, MessageBusInterface $bus = null)
+    public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null)
     {
         $this->transport = $transport;
         $this->bus = $bus;
@@ -40,18 +42,20 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): void
             return;
         }
 
-        $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);
+        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);
+                }
             }
+            $event = new MessageEvent($message, $envelope, $this->transport->getName());
+            $this->dispatcher->dispatch($event);
         }
-        $event = new MessageEvent($message, $envelope, $this->transport->getName());
-        $this->dispatcher->dispatch($event);
 
         $this->bus->dispatch(new SendEmailMessage($message, $envelope));
     }