Merge branch '4.4'

* 4.4:
  [HttpKernel] fix wrong removal of the just generated container dir
  bug #34024 [Routing] fix route loading with wildcard, but dir or file is empty (gseidel)
  [Routing] fix route loading with wildcard, but dir or file is empty
  bump Form component compatibility versions
  execute all compatible tests across versions
  [Mailer][MailchimpBridge] Fix NamedAddress obsolete paths

Author: fabpot

Mailchimp/Transport/MandrillApiTransport.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractApiTransport;
 use Symfony\Component\Mime\Email;
-use Symfony\Component\Mime\NamedAddress;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -76,15 +75,12 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
+                'from_name' => $envelope->getSender()->getName(),
                 'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
-        if ($envelope->getSender() instanceof NamedAddress) {
-            $payload['message']['from_name'] = $envelope->getSender()->getName();
-        }
-
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -126,13 +122,10 @@ protected function getRecipients(Email $email, Envelope $envelope): array
 
             $recipientPayload = [
                 'email' => $recipient->getAddress(),
+                'name' => $recipient->getName(),
                 'type' => $type,
             ];
 
-            if ($recipient instanceof NamedAddress) {
-                $recipientPayload['name'] = $recipient->getName();
-            }
-
             $recipients[] = $recipientPayload;
         }
 

MandrillApiTransport.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractApiTransport;
 use Symfony\Component\Mime\Email;
-use Symfony\Component\Mime\NamedAddress;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -76,15 +75,12 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
+                'from_name' => $envelope->getSender()->getName(),
                 'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
-        if ($envelope->getSender() instanceof NamedAddress) {
-            $payload['message']['from_name'] = $envelope->getSender()->getName();
-        }
-
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -126,13 +122,10 @@ protected function getRecipients(Email $email, Envelope $envelope): array
 
             $recipientPayload = [
                 'email' => $recipient->getAddress(),
+                'name' => $recipient->getName(),
                 'type' => $type,
             ];
 
-            if ($recipient instanceof NamedAddress) {
-                $recipientPayload['name'] = $recipient->getName();
-            }
-
             $recipients[] = $recipientPayload;
         }